some fixes
Merge branch 'master' of github:UWNetworksLab/censor-chrome

Conflicts:
	js/background.js