Merge branch 'master' of git://github.com/artlung/Chrome-Last.fm-Scrobbler into slacker

Conflicts:
	manifest.json
	options.html