Make plone work, fix extra:

- Fix buildout version parsing
- Handle versions correctly
- Fix extra
- Support for extra as function
- A lot of other minor fixes