Update travis
Merge pull request #45 from KingCrunch/update-travis

Update travis