Cleaned up the folders and some files from testing; a few tweaks to get factory_girl running right