downgrade jruby to 1.7.8 (to try to fix mac slowness)
Merge remote-tracking branch 'origin/master'
oops