vidplay.net
wayskinny.com
websterwood.com
[Wolfson Microelectronics] Enable
[Wolfson Microelectronics] Don't force www
[Yahoo] Add comment
[Yimg.com] Add jc/
[Ziff Davis] Add comment
Merge remote-tracking branch 'origin/master' into for-5.0

Conflicts:
	src/chrome/content/rules/AOL.xml
	src/chrome/content/rules/The_Boston_Globe.xml
	src/chrome/content/rules/Wikimedia.xml
[Avast] Add comment
[Avast] Cosmetics
[BBC.com] Add/amend comments
[BBC.com] Add ssl
[BBC.com] Split rule subject to broken MCB
[BBC] Move sa.bbc.com to BBC.com.xml
BioInfoBank
[Bitcoin] Add www
Bitcoin Armory.com
[BitcoinWisdom.com] Enable
[BitcoinWisdom.com] Don't force !www