updated waf
added new and improved waf
Merge remote-tracking branch 'origin/update-to-waf-4.0.0'

Conflicts:
	waf