use jruby 1.7.6
bundle update travis-core
Merge branch 'master' of https://github.com/travis-ci/travis-hub

bundle install to regenerate gemfile.lock due to conflicts

Conflicts:
	Gemfile.lock