updates to cmake stuff, hpefully gets travis-ci working