downgrade to jruby 1.7.2 due to a 1.7.4 JIT issue
bundle update to latest core
Merge branch 'master' of https://github.com/travis-ci/travis-hub

Conflicts:
	Gemfile.lock