Fix Build after rebase

This patch fixes the build after rebasing it onto origin/master.
Also updates the .gitignore file after bringing in WAF.