Updated bootstrap.py and Makefile to make buildout compatible with newer...

Changed the bootstrap.py to a newer version, compatible with newer versions of python-setuptools. Added new parameters to plone.api.user.get, now accepting userid and username.