I think we're thrashing each other - I started the upgrade yesterday to make way to knock-off: https://github.com/pantsbuild/pants/issues/1658