travis file named wrong
Merge remote-tracking branch 'upstream/master'
Merge pull request #10 from rhyolight/master

travdsdf