Updated for SOCKS proxy support
Merge branch 'master' of github.com:brianwarehime/munk