Vim cleanup

Get rid of some vim bundles
Update zsh config
Git pull using --rebase option