couple of things deprecated in rails 4
Fix merge conflicts with db schema