Updated tool importing
Merge branch 'master' of github.com:samuelhug/external-waf-tools