Latest canonical version of document layout
some betacode fixes
Merge branch 'master' of github.com:nkallen/pseudw

Conflicts:
	.gitmodules
	lib/annotated_edition.coffee
	test/annotated_edition.coffee
	vendor/canonical