Adapt upstream to dotfile-appropriate layout.
Add xterm/vim workaround.