Fix crash for #51.
Add a simple favicon. Feel free to improve it.
Merge pull request #53 from fractaloop/favicon

Add a simple favicon. Feel free to improve it.
Prepare for merge.
Merge branch 'master' of github.com:martindale/soundtrack.io

Conflicts:
	views/layout.jade
Adjust lexers.
Allow environment variables for configuration..

Allow database name to be configurable.

Fix issue with config merge.
Allow for multiple running instances.
Fix profile markdown!
Fix a crash in startMusic();
Add new desktop notifications setting.
Better profile editing.
Merge branch 'master' of github.com:martindale/soundtrack.io into angular-merged

Conflicts:
	public/js/app.js
	soundtrack.js
	views/layout.jade