Merge branch 'master' of https://github.com/martindale/soundtrack.io

Conflicts:
	soundtrack.js
Merge branch 'master' of https://github.com/martindale/soundtrack.io
Add validator for cleaning xss from chat
Merge pull request #32 from unusualbob/mark-xss

Markdown xss sanitization
Modify the lexer to customize markdown!
Try to parse more artists.
Cosmetic cleanup.
Fix bug in track artist prediction.
Pull data from last.fm
Add better log information when youtube api fails.
Allow video to resize responsively.
Merge branch 'master' of https://github.com/martindale/soundtrack.io into angular-merge

Conflicts:
	public/js/app.js
	soundtrack.js