bugfix: Makefile should not reference a removed target
first pass at tests
some schema bugfixes
schema change: allow tei:if to use model.conditionContent and tei:f to be in conditionals in declarations
bugfixes to conditionals API code
bugfixes and improvements to tests for conditionals API
Merge branch 'feature/conditional-tests' into develop

Closes #88