added more json test cases, fixed some documentation, changed test to match docs
Merge pull request #5 from antislice/upstream

added more json test cases, fixed some documentation, changed test to match docs