vim, bash, zsh, gitconfig
Merge branch 'master' of github.com:pm11/dotfiles