remove duplication of code
Merge pull request #199 from MartinGoulet/dry

remove duplication of code
update factory_girl_rails dependancy