Merge pull request #42 from hildjj/cmake-backports

Make Travis cmake builds less interesting, hopefully faster as well