updated factory_girl
Some code cleanup
Removed unneeded method and callback
Added class seeds
code cleanup