Git user creation bug
Merge branch 'userCreateBug' into dev
Merge pull request #261 from alexmckenley/dev

Changed createUser to findOrCreate