incorporated edits and changes after internal EFF review
fix merge conflict because of my prior fix to links in the middle of a proposed EFF change
Merge pull request #6 from unitedstates/eff

Re-do EFF submission after resolving merge conflict