[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
[Sony] Remove (www.)?us.playstation.com

Akamai.
localbitcoins.com
[Internet Archive] Really exclude pgdp01.us

Mistake in 33108ce5e9ceb6d8a0961f082c100c1b40e0b8b5
[University of Strasbourg] Force www

https://trac.torproject.org/projects/tor/ticket/9897
[University of Strasbourg] Split false MCB coverage
[University of Strasbourg] Rewrite lsiit-cnrs to icube