Feature/rails3 ruby20

This revives #401 as feature/rails3 no longer is our development branch.