removed duplicate guard reference, added factory girl
added factory files
Merge pull request #10 from MorleyB/feature/factory_girl_guard_cleanup

Feature/factory girl guard cleanup