Fix Travis builds

Broke with c4960d9
Merge pull request #85 from paulmelnikow/travis-fix

Fix Travis builds
Refactor Travis rig