More PEP-8
Merge branch 'devel' of github.com:Devristo/tribler into devel

Conflicts:
	Tribler/AnonTunnel/Socks5AnonTunnelServer.py