Fix compile error if !(defined(__GLIBCXX__) || defined(__GLIBCPP__))
Merge branch 'master' of ../moses
Fix a few compiler warnings (from Clang mostly).