enriched trace
Merge branch 'master' of ssh://github.com/moses-smt/mosesdecoder
Merge github.com:moses-smt/mosesdecoder into hieu_opt_input