add linkify as an alternative to magic regex
Merge branch 'master' of https://github.com/martindale/soundtrack.io
Merge branch 'master' of https://github.com/martindale/soundtrack.io

Conflicts:
	views/partials/message.jade
Move chat to center block. Thanks, @fractaloop!
Fix playlist formatting.
Add announcements for skips, show curator of current track, add redis to package.json, use logical scroll code :P
Merge branch 'master' of https://github.com/martindale/soundtrack.io into skips

Conflicts:
	public/css/main.css
	public/js/app.js
	views/index.jade
Move chat to center block. Thanks, @fractaloop!
Fix playlist formatting.
Fix listeners not being removed when they disconnect
remove excess log
Merge branch 'master' of https://github.com/martindale/soundtrack.io into listeners

Conflicts:
	views/index.jade
Merge pull request #15 from unusualbob/skips

Notification of skips, show who added current song
Merge pull request #13 from unusualbob/master

Linkify as an alternative to magic regex
Merge pull request #16 from unusualbob/listeners

Fix listeners not being removed
Fix conflicts