Merge pull request #267 from Spittie/master

Add rule for techreport.com
[Floor64] Add TechDirt support

Conflicts:
	src/chrome/content/rules/Floor64.xml
Merge remote-tracking branch 'galenide/master'
[Wikia] Turn off by default
Merge pull request #264 from stqism/patch-1

Adds *.tox.im ruleset in preparation for May
Merge pull request #179 from KOLANICH/master

Added WSH script to build rules file on Windows without python.
Merge branch 'cb-rulesets' of https://github.com/CodeBlock/https-everywhere into CodeBlock-cb-rulesets
[Tox.im] Merge tox rules
Merge branch 'master' into CodeBlock-cb-rulesets
Merge pull request #297 from jpds/wikispooks

[Wikispooks] Added ruleset.
Merge pull request #294 from denilsonsa/master

Adding trivial userstyles.org ruleset.
Merge pull request #288 from Danw33/webshop-revolution-ruleset

Added new ruleset for WebShop Revolution (webshoprevolution.com)
Merge pull request #280 from brahim-raddahi/freewebsitetemplates-ruleset

added a ruleset xml file for freewebsitetemplates.com
Merge pull request #266 from Brawl345/pegelf

Add rule for pegelf.de
Merge pull request #261 from KeenRivals/master

Add rules for Brashear.me and Lasallehs.net
Merge pull request #258 from J0WI/patch-44

Create opendatacity.xml
Merge pull request #248 from alexmuller/add-york-ac-uk

Add simple rule for www.york.ac.uk
Merge pull request #213 from fser/master

Adding two rules
Merge pull request #212 from eduarrrd/master

Support mangaupdates.com.
Merge pull request #219 from nyantec/master

Add rules for tersee.com and *.tersee.com