CreateFromString no longer requires factorDelimiter
Merge branch 'master' of github.com:moses-smt/mosesdecoder
non-term must have only 1 factor.
Merge ../mosesdecoder into hieu