Updated user model to allow for settings
removed redundant code
Manual merge from master
Merge pull request #230 from jembi/user-settings

User settings option in model schema