Bump CMake subtree
Fix travis