Organise imports.
Merge branch '0.1-maintenance' into 0.2-maintenance

Conflicts:
	setup.py
Release 0.2.1