Update build tools to 21.1.1

Also improve .gitignore