Changed charmstore-apiv4 to just charmstore-api as per review
Created util method for fetching charm icons which dispatches to either the charmstore or the env depending on what kind of icon is required