Merge pull request #21 from panesofglass/master

Cleanup and Fix JSON/JSONP support