Merge pull request #103 from craigcitro/master

Finish switching to mock from mox.