cleaned some more and added changes from vim and zsh rc