Git config updated with aliases
Merge branch 'master' of https://github.com/skwi/dotfiles

* 'master' of https://github.com/skwi/dotfiles:
  Vim colors