Add .vim directory and clean up .vimrc