Start working again with a lot of cleanups and double check (mainly on
alignment)
Add tracking to alignments.
Merge branch 'master' of https://github.com/rohanramanath/semantics.git

Conflicts:
	multiScript/src/main/java/edu/cmu/cs/lti/multiScript/io/ConllWriterAe.java