Updated travis
Merge pull request #23 from TheHydroImpulse/update_travis

Updated travis