updated chaching of annotations
Merge branch 'local'

Conflicts:
	peyotl/phylesystem/__init__.py
resolved conflict
test corrected