Merge pull request #26 from ajhodges/master

Filter in insert_with_lock_in, fix scrolling. Fix init.
Added block for viral porn spam
Added blocks for URL shorteners, clothing ads
Updated to block spam/advertisement links
Added a few more blocks
Added filters for "cheap/free games" spam
Separate filter into toggleable features
Forgot to remove a logging statement
Add "wait" command to array of blocked words
Add URL whitelist
Merge pull request #34 from renfredxh/master

Add "wait" command to array of blocked words
remove http frpm url whitelist
Put the filter settings out of the way
Merge #32

Conflicts:
	chat_filter.user.js
Merged the message modifying options to #32

Merged the color @username, convert allcaps to lower, filter out
duplicate urls and such to commit #89/PR #32
Fixed ALLCAPS_conversion on some message

Fixed ALLCAPS_conversion failing on message consisting of more than one
tag, such as colored @username messages from the modifyer prior to it.
Also moved some stuff around for ease of changing stuff (relevant stuff
closer to eachothers).
Just changing some comments

No code should have changed
Merge pull request #37 from feha/modifying-options

merged #37 (options to color directed messages and convert ALLCAPS to lowercase)
Fixed the display problem, where the most recent chat entries are cut off because of the addition of the control panel and the button
Merge pull request #39 from jcao219/chat_scroll_height_fix

Fixed a display problem with the chat getting hidden below filtering options. Fixes issue #36. Thanks jcao219!