Merge branch 'http' into http_02 (essentially master)

"Hey, it's essentially a rebase, you just have to deal with all the
conflicts at once instead of one at a time"

 Conflicts:
	sbws/__init__.py
	sbws/config.default.ini
	sbws/core/scanner.py
	sbws/lib/helperrelay.py
	sbws/util/stem.py
	tests/testnets/.gitignore
	tests/testnets/simple.common/01-gen-configs.sh