Add a marquee to annoy everyone.
Merge branch 'master' of github.com:martindale/soundtrack.io
Use inline parser for chat
Merge branch 'master' of github.com:martindale/soundtrack.io
Change to linkify, properly escape using underscore
Minor cleanup to prepare for merge.
Merge branch 'markdown' of https://github.com/unusualbob/soundtrack.io

Conflicts:
	views/partials/message.jade