updated waf
Merge branch 'master' into update-to-waf-4.0.0
added new and improved waf