undid changing annotations to strings
Merge branch 'local'

Conflicts:
	peyotl/phylesystem/__init__.py