Update
Merge branch 'origin' of github.com:mikefreeman/ror-resources into origin