fix travis build

small fixes to get travis to run and fix all but one test. That one is fixed by the other pending pull request i hope.