Revert "More attempts to get travis to work"

This reverts commit d96410b278bbe546f2eb5404b8f8cfafd45fd225.