config.make conditionally uncommented
Merge branch 'develop' of https://jirihavel@github.com/jirihavel/evil-make into develop

Conflicts:
	make/config.make.in