Removed obsolete paraphrase tools.
Fixed a warning.
pulled in additional thrax tweaks
updated thrax to 2.0 release
sort uses the same amount of memory as reserved for the grammar packer
Merge pull request #87 from lukeorland/bugfix.packer_sort

Sort packed grammar in memory, instead of on disk
turned off MBR by default (slow!)
added --mira-iterations parameter
added --hadoop-conf option
Merge branch 'devel' of github.com:joshua-decoder/joshua into devel
replaced (broken) berkeley parser multithreading with black-box parallelizer multi-threading
bugfix in blank-line filtering regexp
args parsing
enhance robustness and messaging for command-line usage
improve --srilm-bin SRILM handling
implement merging
remove kenlm stuff. That can be accomplished outside this script.
moved unit tests to separate file:

because the mock module couldn't be found.
make merge_lms.py executable
add merge-lms step to pipeline.pl