update gemrc, add jruby_opts
Merge remote-tracking branch 'origin/master'