Replacing instances of generate_ functions with appropriate FauxFactory methods.
Removing all instances of FauxFactory class.
slight changes to formatting.
Merge pull request #1463 from JacobCallahan/master

Replacing instances of generate_ functions with FauxFactory methods