add FactoryGirl methods to spec helper and appropriate changes in specs
Merge pull request #43 from fs/include-factorygirl-methods-to-spec-helper

add FactoryGirl methods to spec helper and appropriate changes in specs