Update .gitignore

Added more cruft to .gitignore to avoid polluting the repo.
Merge branch 'master' into WIP/waiting-reason