Update travis
Merge pull request #51 from srod/travis-update

Travis update