include improvements by HashRocket
merge local changes
resolved install issues
fixup gitconfig.local
Merge branch 'master' of github.com:gamelinchpin/dotfiles

* 'master' of github.com:gamelinchpin/dotfiles:
  update dotfiles

Conflicts:
	.gitlogger