Ignore buildout artifacts.
Update to latest bootstrap.
Don't extend an out-of-date Z2 version set.
Resolve conflict.