Revert "Merge pull request #261 from sfmailand/userModel"

This reverts commit 0eb2203b373da1964f65315a0a4c3fb9147a8adf, reversing
changes made to 0a568352521e5f076a793880ca8879446b5e780e.
Merge pull request #263 from ryanbaylorkillea/tempmaster

Revert "Merge pull request #261 from sfmailand/userModel"