Merge pull request #1 from triblondon/master

Pulling recent commits from upstream.
Adding icons
New build
Merge pull request #3 from robertshilston/master

Icons, and prep for Chrome web store.