[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
[The Motley Fool] Split false/broken MCB coverage

https://github.com/EFForg/https-everywhere/issues/529
[Fool.com] Emulate redirect precisely
[PornHub] Fix exclusion
[Urban Dictionary] Add exclusion
[Web.com] Fix target
[Flickr] Update from master

Requested in part by a Flickr employee:

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

[Flickr] Secore some cookies

[Flickr] Secure cookie

[Flickr] Don't rewrite from www to secure

www seems to work fine as-is now.

[Flickr] Add comment

[Flickr] Rewrite to www rather than secure

Conflicts:
	src/chrome/content/rules/Flickr.xml

[Flickr] Cosmetics

Conflicts:
	src/chrome/content/rules/Flickr.xml

[Flickr] Add coverage

Conflicts:
	src/chrome/content/rules/WordPress-blogs.xml

[Flickr] Add comment

[Flickr] Chrome friendliness

Conflicts:
	src/chrome/content/rules/Flickr.xml

[Flickr] Cosmetics

[Flickr] Fix comment

[Flickr] Add c2.staticflickr.com

[Flickr] Add coverage/update

Conflicts:
	src/chrome/content/rules/Flickr.xml
[Web.com] Remove target

Mistake in 66b64a9ef726a7c06a0e03a9b28939006acc44ea
[SciVerse] default_off → platform