Update to new more advanced vim plugin