Update the travis.yml file from another PR branch so this one will pass.  This may cause conflicts when merging down the road, but cest la vie
Update the travis.yml file from another PR branch so this one will pass.  This may cause conflicts when merging down the road, but cest la vie

PMEAL/OpenPNM,stadelmanma/OpenPNM,TomTranter/OpenPNM