Merge pull request #191 from davidbgk/master

Fixing API tests for travis, hopefully once and for all.