Autoproxy support for json and serpent (marshal is impossible). Fixes #2.
Merge remote-tracking branch 'origin/master'