Fix English names containing the word "the"

See DFHack/dfhack#245
remove space before hyphen
Merge remote-tracking branch 'origin/patch-1' into develop
update rst->html
fix g++ warning