HothouseLabs/ocmock — pull request #1 by ierceg (2014-08-19 17:55:50+00:00)
Title: Merged all the changes since July 2013

No need to merge this just yet, we'll need it once assistant_prototype is merged.