Added buildout.
Fixed up analyze buttons.
Merge remote-tracking branch 'origin/master' into switchToFoundation