Replacing instances of orm.type.get_value() with fauxfactory methods. Also, resolving merge conflicts.
Changed string formatting, and minor fixes.