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

Conflicts:
	manifest.json
	options.html
Merge branch 'master' of https://github.com/david-sabata/Chrome-Last.fm-Scrobbler into dev2
mac file added to gitignore
Merge pull request #141 from lacivert/dev2

mac file added to gitignore