Alec Warner

Hey Jaq, long time no see. I have some patches for this (still WIP; but migrating to unittest.mock.) I'll try to submit em by this weekend. -A