change to jruby 1.7.4, and bundle update to latest core and support
Merge branch 'master' into jk_jruby_1_7_4
run tests against 1.7.4