pair programming with Jim to get db:setup working with the new housekeeping changes in factory girl
Merge remote-tracking branch 'origin/master'