[Pypi] no longer CACert
[Mashable] mixed content

Conflicts:
	src/chrome/content/rules/Mashable.com.xml
[NYTimes] disable securecookie to unbreak discussion on subdomains

https://trac.torproject.org/projects/tor/ticket/7690
Merge the ImageShack.us ruleset from master.

https://trac.torproject.org/projects/tor/ticket/8128
[American Public Media] needed to be renamed for off-by-default
disable per https://trac.torproject.org/projects/tor/ticket/7650
[SourceForge] Add blog, match https, don't force www
[SourceForge] Add comment
[SourceForge] Add comments
[SourceForge] Add comment
[SourceForge] Add coverage
[SourceForge] Cosmetics
[SourceForge] Fix
[SourceForge] Add account/
[SourceForge] Handle hyphens in *.svn
break out .jp redirection per https://trac.torproject.org/projects/tor/ticket/8349
coverage of sourceforge.jp is going to be very partial
[WolframAlpha] behaves weirdly on chromium, disable there

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

This might be an instance of or related to

https://code.google.com/p/chromium/issues/detail?id=122548
default off per https://trac.torproject.org/projects/tor/ticket/7569
Begin Changelog for 3.1.4