Fixed manifest and some text to be ready for the Chrome Web Store
erged conflict