Merge Travis CI changes from develop into master

We should get Travis up and running on master.