a bunch of real nice fixes
Merge branch 'master' of https://github.com/sjas/.dotfiles
several damn nice git fixed... 'gdh' FTW!