Merge pull request #12 from bchiatt/angular

cleaning up json files
renaming json properties to align