little fixes
Merge branch 'master' of https://github.com/wuwi/cahoots

Conflicts:
	chrome/content_script.js
	firefox/lib/main.js