PyPI! [skip ci]
borked the docs and readme... [skip ci]
good god I suck at this. readme is still borked [skip ci]
Okay, last one, I think. [skip ci]
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	README.rst