Added conversion and output of lines to json
Merge pull request #136 from KittyTristy/working

Punctuation patch! (and new emoticon detection in reply filter)
Merge pull request #137 from KittyTristy/working

Patched my patch!
Disabled json output for now.
Merge branch 'master' of github.com:scoundrels/scrib
Merge pull request #138 from KittyTristy/working

[DON'T MERGE YET!] Super-charged Emoticon Filter!
New emoticon engine, forgot version update.
New emoticon engine, forgot version update.
Merge branch 'master' of https://github.com/scoundrels/scrib
New emoticon engine, forgot version update.
New emoticon engine, forgot version update.
Merge branch 'master' of https://github.com/scoundrels/scrib
Merge branch 'master' of github.com:scoundrels/scrib
Missed an emote.. derp.
Merge branch 'master' of https://github.com/scoundrels/scrib into working