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