updated links and cleaned up link to openpgp best practice, no substantive edits
resolved conflict in merge
Merge branch 'master' of ssh://github.com/dtto/riseup_help