Fixes for Python 3.3 compatibility
Add documentation on setting up a test environment
Merge commit '25d1a4c'

Conflicts:
	README.rst
	popolo/models.py
	popolo/tests.py
Bump version.