Update CMakeLists.txt
Update .travis.yml

Last: #516
Merge pull request #644 from DavidRagazzi/patch-1

Update CMakeLists.txt
Merge branch 'master' into travis-cmake
Merge pull request #1 from rhyolight/travis-cmake

Merging in master for CMake in Travis