Moar factory girl

HAY GUISE. I made all the tests use FactoryGirl, and cleaned them up a bit while I was in there.  Take a look?