Merge pull request #10 from MarkTonkinson/master

Mark's Big Auth Service Pull
userModel serverjs fix
please
fixed gitignore again
Merge pull request #12 from kweek/master

Krissy's User Model Changes
fixed?