Refactor user factories
Merge pull request #376 from projecthydra/factory_girl_corrected

Refactor user factories