oops -- pushed some conflicts :(
Merge branch 'master' of https://github.com/jefftimesten/ofxJSON