This took a lot longer than it should've
Merge pull request #22 from theodi/travis-magic

This took a lot longer than it should've