First pass at moving to Rails 3