Rebase relevant commits from 1.5 to 2.0

This should bring everything up to date with the new features and the presence of the extension in the Chrome web store.