Refactor charmstore to use new helpers in jujutesting.
Update dependencies.
Fixing mistakes in import grouping.
Merge pull request #245 from frankban/use-testing-json-assertions

Use testing json assertions

Big branch (apologies!) but mostly mechanical.

Also updated dependencies.