vi rebuild, xfsprogs 3.1.11, more core git cleanup