ok, this should do the trick for travis ci to work fine (+ some related cleanups)