Also, fix a merge issue with .circleci/config.yml (missing install-cmake-on-macos in commands section)