added more to alignments and thesis.bib
fixed the conflict in ACL 2014.tex