WIP rails 4 upgrade
Updated to Rails 4