Updating Travis for master compatible
Merge pull request #25 from halkyon/travis_update_master

Updating Travis for master compatible