Moved tunneler to socks-proxy
Added switches to shell-proxy
Fixed a few bugs in socks-proxy