Updating waf to 1.6