Fixes #400 - strip deeply nested $ prefixes when saving json
Merge branch 'master' into kato-400
Merge pull request #406 from firebase/kato-400

Fixes #400 - strip deeply nested $ prefixes when saving json