Revert "Merge pull request #232 from tmcgilchrist/fix_travis_ci"

This reverts commit e30318edd19428c87248af2a74560b03415027a0, reversing
changes made to e2d8cae79c8d3809a9ce9841cb15051f13bdc074.