Test against 1.6 branch, not bleeding edge.
Replace simplejson with core json.

Include a <1.6 test for the possibility the encoder class is still
coming from an installed simplejson.
Fix some other deprecations.