zproxy api adjustments (zproxy_bind now spawns attached thread and starts proxy) + test improvements
fixing merge conflict in zproxy.c
Merge pull request #287 from Talksum/master

zproxy api adjustments + test improvements