Add some basic argparse to require explicit --generate-new-key flag
Merge branch 'master' into encrypted_response