extra debug
fix
Merge branch 'master' of https://github.com/moses-smt/mosesdecoder
update
debug
debug
Merge branch 'master' of github.com:moses-smt/mosesdecoder
Merge branch 'master' of github.com:moses-smt/mosesdecoder

Conflicts:
	moses/Hypothesis.cpp
Merge branch 'master' of https://github.com/moses-smt/mosesdecoder
bugs in FF MaxSpanFreeNonTermSource
ems: delete a run. may work.
Fixed file path for ug_stream.h in merge-sorted.cc.
Initial check-in.
Put libraries in the right order for things to work.
Initial check-in of moses.py
Code refactoring of scripts/server/sim-pe.py.
Tried to get merge-sorted to compile under bjam. Didn't work.
Major revision of m4m. May not be backwards-compatible.
Bug fix in and in connection with Mmsapt::combine_pstats().
Added server port number as a command line option to sim-pe.py.
This is important to allow running independent servers on the same machine.
Moses server (in moses.py) will not look for a free port any more if the
port specified is not available.