Proxy the raw JSON rather than merging it in

All root level raw JSON attributes are accessed through proxy methods.
Fixed some of the JSON so that it works with the proper structure.
Merge pull request #56 from mattdenner/proxy_raw_json

Proxy the raw JSON rather than merging it in