update git email + few changes
Merge branch 'master' of https://github.com/hspak/dotfiles

* 'master' of https://github.com/hspak/dotfiles:
  cleanup