Update package versions prior to rebuild
Refactor buildout infrastructure

Update to latest best best practice and version pins