Recovering Derek's JSON edits
Merge pull request #60 from cloudsleuth/master

Recovering Derek's JSON edits