More suggestions from my conf file.
Merge pull request #1 from flamsmark/gpg

Suggestions from my config file