Supervisor/supervisor — pull request #420 by msabramo (2014-04-16 18:59:09+00:00)
Title: Increase coverage

These are just some commits from @npilon to increase test coverage that I cherry-picked from @gcarothers' branch at https://github.com/LexMachinaInc/supervisor/commits/fixoptions.py3k