Fix a few typos in .future files.
Revert inlining of ChapelNumLocales in each LocaleModel.

The change in order of the modules named in ChapelStandard must have resolved the
dependency between LocaleModel and ChapelLocale in a different way.  So the inlining of
ChapelNumLocales is not in fact necessary (and is undesirable by the code duplication
argument).