Merge branch 'initial_virtis_calibrated_camera_model' of https://github.com/kberryUSGS/ISIS3 into initial_virtis_calibrated_camera_model