Tidy up vimrc, add showmarks.