Nicer error message for too many factor delimiters
Merge github.com:moses-smt/mosesdecoder into weight-new