messed up some stuff for travis-ci, adjusting...