gitignore bak & log files
Merge branch 'master' into vimsafe

* master:
  gitignore bak & log files