updated specs
updated gemfile for factory girl.  mod to config for deprecation warning
updated merge conflicts
Merge pull request #19 from mdidier9/factory-girl

Factory girl