no_clobber_xff option
Merge commit 'da1d67dc1423426df393c94a8999fb6be8765e59' into feature/per-server-control-port
Merge 'feature/per-server-control-port' -> develop

Resolves pull-request #180
Merge commit 'c7f57eda1cad71f49f7344a263dbf8a251f5bcde' into feature/remote-addr

Pull request #181

In handler mode, set special header REMOTE_ADDR containing the IP
address of the requesting client. Setting no_clobber_xff prevents
X-FORWARDED-FOR from being touched in handler mode.

Proxy mode remains unchanged. REMOTE_ADDR is not set in that context,
and X-FORWARDED-FOR is always set/replaced (no_clobber_xff has no
effect on proxy mode).
Merge branch 'feature/remote-addr' into develop

Closes #181
Merge in keep-alive xreqest code

jkarneges pull request #183

Merge commit '3f6070ef8ddd2a05300e542041b56d9d0142fe73' into feature/keep-alive
Merge branch 'feature/keep-alive' into develop
Make filters depend on libm2.a

Previously they weren't rebuilt which caused problems if (for example)
the conn structure changes.
fix handling of empty data message for disconnect
Make chroot optional

Just jkarneges pull-request #182 with cleaned-up history
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	src/mongrel2.c
	src/request.c
	src/unixy.c