fix some leftovers
Merge branch 'issue_341' into server_change_api

Conflicts:
	examples/redirect_requests.py
	libmproxy/console/common.py