This shouldn't be necessary, but still...
Merge pull request #73 from theodi/bugfix-fix-travis

Fix broken tests