Merge pull request #283 from Talksum/master

initial check in of new zproxy feature
Whitespace fixes
Merge pull request #284 from hintjens/master

Whitespace fixes
Include zproxy in README
Merge pull request #286 from claws/zproxy-readme-update

Include zproxy in README
fixing merge conflict in zproxy.c