Add annotations by Joel Kuiper (JKU)
Add Iain's annotations (IJM)
Add preliminary version of annotation merger
Rename agreement.py to tokenizer.py
Minor fixes