Making sense of the blacklist pt 3
Merge pull request #219 from shurizzle/master

Making sense of the blacklist pt 3
Merge remote-tracking branch 'origin/master' into db_refactor

Conflicts:
	class/comments.class.php