Merge branch 'master' of github.com:moses-smt/mosesdecoder into nadir_osm
Unbreak build by disabling OSM without SRI.
TODO(nadir): remove (or make optional) your dependence on SRILM then undo this commit and remove the if statement from the Jamfile.
Merge branch 'master' of github.com:moses-smt/mosesdecoder into nadir_osm