Update deps

Bump factory_girl and rspec, update specs to deal with some deprecations.