[Scientific American] Exclude content & mark as mixedcontent
https://trac.torproject.org/projects/tor/ticket/8077
[Scientific American] Remove an exclusion and use redirects instead

Less intrusive fix for ticket #8077:
https://mail1.eff.org/pipermail/https-everywhere-rules/2013-February/001487.html
[Ooyala] exclude crossdomain.xml

If cypherpunks recall correctly (ICRC) this might fix
https://trac.torproject.org/projects/tor/ticket/7615

Conflicts:
	src/chrome/content/rules/Ooyala.xml
[SalsaLabs] breaks the blog, disable
Merge remote-tracking branch 'negres/3.0' into 3.0
[Comodo] Fix https://trac.torproject.org/projects/tor/ticket/8133
Redirect siteinspector.comodo.com to app.webinspector.com
A cruder variant of Mikko's change in 4.0
Add https urls to be processed by https everywhere
[Uservoice] Exclude developer.uservoice.com

https://trac.torproject.org/projects/tor/ticket/8199
[Zendesk] Exclude developer.zendesk.com

https://trac.torproject.org/projects/tor/ticket/8198
Sandbag

Fixes images missing for store.atomsforpeace.info

Reported on IRC.

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