Switched to json
Merge pull request #3 from peoplemerge/master

Switched to json