tidy up
Merge branch 'master' of github.com:moses-smt/mosesdecoder