Changes to merge
...
Merge branch 'nineml_convergence' of github.com:mikehulluk/NeuroUnits into nineml_convergence

Conflicts:
	src/neurounits/__init__.py
...
...