#85 fixup/cleanup

Supersedes #85. Behavior is changed slightly from @dnozay's version in a way that I test exactly what users are told to do in https://github.com/letsencrypt/lets-encrypt-preview#hacking. Read comments in changed files for more info.