Initial Rails 3.2 commit (started from scratch to convert)