CMake tweaks
Add Travis CI config
Travis CI fix
Merge pull request #1 from eile/master

CMake cleanups