added factory girl funcionality and added user tests
Merge branch 'master' into jake