cleanup
Merge branch 'master' of https://github.com/pbardea/chromecc

Conflicts:
	background.js