Minor tweaks in build system
Merge branch 'master' of github.com:varnish/Varnish-Book

Conflicts:
	Makefile