- Changed to factory-girl
- Add ability to return from generator functions which don't take a callback
- Use node-style callbacks