rename import paths
Merge branch 'rename-bundle-to-archive' of github.com:rogpeppe/charm into rename-bundle-to-archive