Updated travis configuration (now that travis has been set not to build branches without a .travis.yml file)
Merge pull request #101 from troopjs/feature/travis

Updated travis configuration