settle on "include-site-packages" and migrate all variations of "add-site-packages" to that spelling.

this is now the branch for my site-packages changes.  It is merged with trunk.  The zc.recipe.egg recipe returns to being fully backward compatible; if you want to use a system Python, use the z3c.recipe.scripts recipe for scripts and interpreter.

the whitespace-police, the typo-police, the grammar police, and the Windows testing police all joined together for this check-in of mostly trivial changes.

merge of gary-2-bootstrap-changes into trunk, resolving lots of conflicts with the distribute changes.