Merge pull request #2 from georgecrawford/master

Convert to Chrome extension
Merge remote-tracking branch 'upstream/master'

* upstream/master: