Update travis-build
bundle update time, including a vagrant update
Merge branch 'master' of https://github.com/travis-ci/travis-worker
always bundle with jruby
vagrant and archive-tar-minitar do not seem to like jruby in 1.9 mode, so i'm using 1.8 syntax in the gemfile so I can easily switch between the two modes
Merge branch 'master' into staging