some betacode fixes
Merge branch 'foo'

Conflicts:
	lib/annotated_edition.coffee
	test/annotated_edition.coffee