Reorder GRIB/CF map entries.
Merge pull request #853 from bjlittle/reorder_grib_cf_map

Cosmetic reorder of GRIB/CF map entries.