Add rubyj alias to switch to jRuby 1.7.12
Merge branch 'master' into for_fun