Pull changes from OpenBSD as of 2014-07-30
Merge branch 'OpenBSD'

Conflicts:
	src/usr.sbin/relayctl/Makefile
	src/usr.sbin/relayd/Makefile
	src/usr.sbin/relayd/config.c
	src/usr.sbin/relayd/parse.y
	src/usr.sbin/relayd/relay.c
	src/usr.sbin/relayd/relay_http.c
	src/usr.sbin/relayd/relayd.conf.5
	src/usr.sbin/relayd/relayd.h