Remove extraneous .zsh
.vimrc: Remove unneeded directives, fix lang
Merge pull request #1 from xales/master

Various minor fixes