Re indents models + Rails 3 compat fixes