Squashing some commits from the Travis CI setup