Merge branch 'master' of github.com:zmanring/chrome-ext-delicious