Upgraded syntax for FactoryGirl

The FactoryGirl gem has changed its syntax.  These are
the changes needed to make it run.

In addition, I moved all factories into separate files and
added a verify spec for all the factories.