Add WAF 2.0.22.

Since there seems to be compatabiltiy issues with certain versions of
python, adding and using waf2 seems to work.
The original version of waf is still included, and should be used first
if it works.