Now that we have public_key_path, clarify its relationship to "username".

Also, alphabetize configuration section.