Merge branch 'conda' of https://github.com/Kelvinrr/isis3_cmake into conda