Buildout changes

This pull requests contains all the changes on my dev site since the last time it was updated