Pin the root-dwelling gitignore items to the root.
Merge master into ui to get the gitignore root-pinning changes.

I wanted to pull those in before I forgot what I had just done to .gitignore on ui.