Update env.rb

Bumping up timeouts...
Update env.rb

Bumping it up even more...
Added Travis build image
Merge pull request #123 from petems/patch-1

Bump aruba timeouts to greenify travis.
Merge branch upstream 'master' into proxy