tidy up vimrc and use unite