Merge proposals dependent on lp://staging/~schooltool-owners/schooltool/jelkner2007-buildout

1. jelkner2007-buildout
2. Dependent merge proposals