Merge pull request #119 from rilian/master

fix some wording
TravisCI badge