cmake config
travis script update to work with cmake
Merge branch 'master' of https://github.com/lonski/amarlon