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