Merge branch 'virtis' of github.com:USGS-Astrogeology/ISIS3 into initial_virtis_calibrated_camera_model