REFACTOR feature #20

@Fiachna - Johnny told me to submit this pull req so that you can update your fabricate codes.

See spec/fabricators/user_fabricator.rb