Revert "Remove xorg stuff"

This reverts commit 56f9137b6bba512dbd1b93ae662a4aa3eab63020.
Merge branch 'master' into x201
Revert "Remove x201 specific zshrc.local"

This reverts commit 9aed0d0a76d17df886aa80587fc0a4b0fd011cbd.
Remove highlight.
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
Revert color
Merge branch 'x201'
Found that using branches to keep track of device-specific settings is
awkward. Going to use subdirectories instead.