Monkey-patching replaced with unittest.patch.  Somewhat saner.  closes #93
Merge branch 'issue93' into devel