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