Major package overhaul with zc.buildout-2.0.0