Fix having accounts with zero size included in averages and using bare_storage_url when swift is not in service catalog

Thanks for putting this tool out there, here are some changes I found helpful.

Thanks,

-John