Creating template
Merge branch 'master' of github.com:natea/plone-openshift-quickstart
Merge remote-tracking branch 'upstream/master'
added some more demos for gilbane
Merge remote-tracking branch 'upstream/gilbane'
add contentgenerator
added whitespace so i can push it
add contentgenerator
Merge remote-tracking branch 'upstream/gilbane'

Conflicts:
	buildout.cfg
adding space
pin to version 2.0.0 of buildout to avoid setuptools issue