charmstore: simplify serving code somewhat
Merge pull request #11 from rogpeppe/001-simplify-serve

charmstore: simplify serving code