Merge pull request #21 from lugensa/master

Some changes regarding solr4
Preparing release 5.0
Back to development: 5.1
Fix rst formatting within egg's long description. Fixes display on PyPI and elsewhere.
Preparing release 5.0.1
Back to development: 5.1
Make 'logdir' recipe option available when generating 'logging.properties' from template. Having 'logdir' available as a template variable in that particular template is quite useful.
Update 'CHANGE.rst' with user visible changes.
Add 'Pedro Romano' to contributors.
Merge pull request #22 from SalesSeek/make-logdir-available-to-generate-logging

Make 'logdir' recipe option available when generating 'logging.properties' from template.
Force Travis to install latest setuptools
Force Travis to install latest setuptools, again.
Remove version pin on old setuptools
Fix tests under Python 3 and enable for Travis
Update buildout bootstrap and use the same for Python 2 and 3
Remove distribute from travis environment.
Please go away Distribute. Really.
Generate 'log4j.properties' from template, since Solr >= 4.3 defaults to using log4j as its SLF4J implementation.
Clean-up trailing white-space.
Add entry for 'log4j.properties' to change log.