Remove x201 specific zshrc.local
Fix up prompt.
Squashed 'vim/.vim/bundle/vim-fugitive/' changes from 3bfa0a2..d6540b2

d6540b2 Work around issue using buffer number rather than name
22cc877 Add missing aborts
218fc37 Revert "Work around more 'wildignore' silliness"

git-subtree-dir: vim/.vim/bundle/vim-fugitive
git-subtree-split: d6540b2588044f4028f6323e421e2e90116c8af7
Merge commit '6f5cbed3bea7eaa356f8af12995be7f362cdeb52'
Revert color