Merge branch 'cmake' of https://github.com/USGS-Astrogeology/isis3_cmake into cmake