Finish unifiying config files
Buildout ordering and cleanup