Save uncommitted changes from last weekend

This is a work in progress... and is not usable yet.
Merge branch 'master' into bridges-work-in-progress

Conflicts:
	templates/torrc
Add initial Tor Bridge obfsproxy support

Right now there is only one install method: python virtualenv + pip;