[Coochey.net] Fix bad pick
[Frontier Network and Computing Systems] Fix back pick
Merge make-sqlite.py from master incl sorting.

This restores the build to determinism.
Fixed Ohio-State ruleset

It appears this ruleset was overwritten recently.
Begin Changelog
New rule for Quora.com to accomodate blogs
More Cowbell/Changelog
Update cert whitelist
[Barnes and Noble] Split imagesBN.com and mark mixedcontent

https://trac.torproject.org/projects/tor/ticket/9656

(obviously it's Firefox that's broken.)

Conflicts:
	src/chrome/content/rules/BarnesandNoble.xml
[Internet Archive] Exclude pgdp01.us

https://trac.torproject.org/projects/tor/ticket/11091
[Microsoft] Add exclusion

https://trac.torproject.org/projects/tor/ticket/9095

Conflicts:
	src/chrome/content/rules/Microsoft.xml
[MySQL] Exclude downloads

https://trac.torproject.org/projects/tor/ticket/10115
[PornHub] Add exclusions

Because porn is oh so socially accepted.
[Royal Institution of Great Britain] Disable
https://trac.torproject.org/projects/tor/ticket/10381

Conflicts:
	src/chrome/content/rules/Royal-Institution-of-Great-Britain-mismatches.xml
Merge remote-tracking branch 'efforg/4.0' into 4.0
[Which?] Point static.which.co.uk to www.staticwhich.co.uk

^staticwhich.co.uk embeds insecure stylesheets.

https://github.com/EFForg/https-everywhere/issues/529
[Which?] Exclude whichstatic.co.uk/$

Though the chances of this being stumbled upon are slim.

https://github.com/EFForg/https-everywhere/issues/529

Conflicts:
	src/chrome/content/rules/Which.xml
[MGID.com] Add comments

https://github.com/EFForg/https-everywhere/issues/529
[Web.com] Add cdn bucket and comments

https://github.com/EFForg/https-everywhere/issues/529

Conflicts:
	src/chrome/content/rules/Web.com.xml
[ClickBank] Add comments

https://github.com/EFForg/https-everywhere/issues/529