tidy up vimfile, other changes
airline not powerline