Merge pull request #180 from hintjens/master

Continuing work for Travis CI
Fixing yet more merge conflicts, gaaargh