[WIP] Upgrading to Rails 3