removed waflib
Merged waf