Add .bak and .orig files to gitignore

Stewart Martin-Haughrequested to merge
smh/athena:gitignore_improve into master

Add a couple of edit/diff formats that crept or nearly crept into the repo.

Merge request reports