zsh: add basic git to prompt
vim: remove old cfengine stuff
Merge branch 'public' of git://github.com/jhujhiti/dotfiles into public