Update some constants from NoScript.
Disable an ABE check that got re-enabled in the merge.

We should double check this is OK to kill.
Remove NS reference that snuck back in..
Bump version to 2.0.2
Manually merge slightly less of HTTPS.js.
Merge remote-tracking branch 'origin/2.0' into ns-2.3.7-merge
Fix a bug in ChannelReplacement.js
add optional platform attribute for ruleset
Add another category of CA-dependency to the grammar
[Fix] Exclude akami CDN from Kohls

https://mail1.eff.org/pipermail/https-everywhere-rules/2012-April/001090.html
Wizards of the Coast ruleset partial fix for Silverlight content
Merge Malwarebytes.xml from master

(Fixing https://mail1.eff.org/pipermail/https-everywhere-rules/2012-April/001087.html)
Disable IBM rule.
Merge remote-tracking branch 'origin/2.0' into 2.0
[Scribd.com] Secure cookies
[Scribd] Add s[1-8].scribassets.com. comments
[Scribd.com] Add fonts
Even with Negres's changes, Scribd is broken :(

https://trac.torproject.org/projects/tor/ticket/5344
Merge remote branch 'origin/2.0' into 2.0
[Statcounter] Secure cookies