Pull city/region out of context.traits.address.
Merge remote-tracking branch 'upstream/master'
Revert "Pull city/region out of context.traits.address."

This reverts commit db029cc5d59100b1a968a288bcc002ee8c4415d4.
Update Amplitude platform/os mappings
Fix Amplitude tests
Merge pull request #249 from amplitude/master

Update Amplitude platform/os mappings