StringMap<T> => Map<String,T>
Merge pull request #3337 from andyli/maps

StringMap<T> => Map<String,T>