Moving .travis.yml to where it should go
Merge branch 'master' of github.com:theepicsnail/Yakr