Ampersand to return to vim, and readme changes