Model Clean Up

* Clean up white space
* Organize DSLs
* Double quotes to single
* Refactor methods
Adds a real spec for User
Merge pull request #347 from ophrescue/model-clean-up

Model clean up