Re-do EFF submission after resolving merge conflict

I added a link to a URL in the middle of a paragraph that @thisisparker edited, making his PR un-automatically-merge-able. This PR includes his commit, along with a commit of mine fixing that merge error (re-adding the link).