Work make functions and tidy up of .vimrc.