Add `*.bak` to .gitignore

DO NOT PR to upstream
Merge remote-tracking branch 'github/master'
Merge branch 'master' of https://github.com/harupong/progit