Fixed issue with xml-ids. Now stores ids for both margins and journeys
in one dict. Warnings should still only print out with duplicate margin notes or
duplicate journey headers respectively, though that probably will have to be checked over.
Merge branch 'master' into kchbranch
changed end of file to work with merge
Conflicts:
	autotagger/autotagger.py
Finished code for creating a version 1 TranscriptionFile from both version 0 and
version 1, but still have bugs that prevent further testing.