Add some more Travis stuff
Merge branch 'master' of github.com:magnusvk/counter_culture