Bring the user model up to Rails 4
Remove depreciated configs
Add user/team association