Rebase code to new version generated by Rails 4