Expand metadata into a separate field, so we don't overwrite template tags on save
Merge pull request #344 from urbanairship/fix-metadata-template-expansion

Expand metadata into a separate field, so we don't overwrite template tags on save