Final quick fixes in response to Brad's comments at https://github.com/certbot/certbot/pull/3258
Final quick fixes in response to Brad's comments at https://github.com/certbot/certbot/pull/3258

stweil/letsencrypt,lmcro/letsencrypt,bsmr-misc-forks/letsencrypt,bsmr-misc-forks/letsencrypt,letsencrypt/letsencrypt,jsha/letsencrypt,letsencrypt/letsencrypt,lmcro/letsencrypt,jtl999/certbot,jsha/letsencrypt,stweil/letsencrypt,jtl999/certbot