Some good rails info, ruby scripting, things to do
Merge remote-tracking branch 'origin/master'