Clean up vimrc and change zsh theme