Merge pull request #341 from smashwilson/update-travis

Update Travis Integration