Update gitconfig
Update shellvars
Merge branch 'master' into sansi

* master:
  Update shellvars
  Update gitconfig
ignore emacs.d/ac-comphist.dat