About to merge
Merged, tidied it up

Conflicts:
	Kappa Everywhere/contentscript.js
	Kappa Everywhere/manifest.json