Update and reindent the buildouf.cfg
Use the latest versions of the eggs
Merge branch 'feature/update-buildout' into develop