edits for JSON output, all so that ember-model will play nicely...