Add a marquee to annoy everyone.
Merge branch 'master' of github.com:martindale/soundtrack.io
Use inline parser for chat
Fix invalid JSON crashing the server
Merge pull request #23 from pantlesswonder/master

Change playlist to use angular
Merge branch 'master' of github.com:martindale/soundtrack.io
Change to linkify, properly escape using underscore
Merge branch 'master' of https://github.com/martindale/soundtrack.io
Minor cleanup to prepare for merge.
Merge branch 'markdown' of https://github.com/unusualbob/soundtrack.io

Conflicts:
	views/partials/message.jade
Stable sorting.
Highlight the curator in the list.
Add pages for artists, tracks.
Fix bugs with artist naming. :)
Some patches to artist links.
Fix curation bug.
Merge branch 'master' of https://github.com/martindale/soundtrack.io

Conflicts:
	soundtrack.js
Make track URLs function.
Display sources on track page.
Better artist search matching.