the model 1 alignment idea
latest feedback run
rename for the day
Merge branch 'master' of github.com:flammie/purplemonkeydishwasher

Conflicts:
	2015-naacl/2015-naacl-smt-morph-segments.tex
	2015-naacl/naacl2015.bib

the private repo update