remove a lot of blurk
Removed password from user model
Merge pull request #2 from JeroenKnoops/cleanup

Cleanup