Checkpoint.
Checkpoint.
Json checker in a separate file.
Remove commented code.
wip
Merge branch '061-csclient-package' of github.com:frankban/charmstore into 061-csclient-package