Reorganize imports.
Whitespace & Py3 style except.
Logging rather than printing.
Py3 compatible doctests.
Use genshi instead of iw.recipe.template.
Version dependencies for Python 3.
Update changelog.
Add bootstrap for Py3.
Fix instance script for Py3.
Rename version to versions.
Add buildout configuration for Python 3.
Fix setup.py genshi dependencies.
Add 'test' extra to setup.py.
Add name to contributors.
Add genshi version pin.
Inherit from main versions part.
Propose this update be included in a major version release and warn about backwards incompatibility more explicitly in change log.
Merge branch 'master' into py3k

Conflicts:
	CHANGES.rst
	buildout.cfg
	collective/recipe/solrinstance/templates/schema.xml.tmpl
	setup.py
	versions.cfg
Fix merge.
Update Solr 4 templates to Genshi templating.