Fixed bugs in Travis testing... again
Merge pull request #24 from im-auld/fix-travis

Fixed bugs in Travis testing... again