Merge remote-tracking branch 'klacke/master'

Conflicts:
	.gitignore
	configure.in
	include.mk.in
	src/Makefile
	src/yaws.erl
	src/yaws_config.erl
	src/yaws_sendfile.erl
	src/yaws_server.erl
	src/yaws_websockets.erl
fix compilation issues with merge
websockets: allow callback module to handle_call()
Merge remote-tracking branch 'jwloh/master'

Conflicts:
	.gitignore
	configure.in
	include.mk.in
	src/Makefile
	src/yaws_sendfile.erl
	src/yaws_server.erl