Merge in jpds/master repo

Hello,

Can someone please merge in my repo of https-everywhere into the mainline repo?

https://github.com/jpds/https-everywhere

Nice tricks I've included are a 'precommit' hook:

And also a load of rulesets and changes to existing ones: