update to waf-tools 2
update config.py
Merge branch 'master' into prepare-for-release

Conflicts:
	NEWS.rst