Merge pull request #6 from bastosmichael/travis-updates

One last attempt at a travis push