Alphabetized additions and fixup List matcher
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Source/content_script.js
Merge pull request #5 from nlipke/master

Alphabetized additions and fixup List matcher