Add environmental variable to switch between TestHTTPD and local HTTPD
Merge branch 'master' into libev