Use FactoryGirl for Users controller testing
Merge branch 'factories'