switching private window testing to private tab testing
resolved a couple of the initialization errors that have been plaguing lightbeam
Merge branch 'master' of https://github.com/mozilla/lightbeam into name-replacing

Conflicts:
	data/content-script.js
	lib/ui.js