Mostly fix up cloudfiles
Mostly fix up cloudfiles

chrisseto/waterbutler,rafaeldelucena/waterbutler,Johnetordoff/waterbutler,cosenal/waterbutler,kwierman/waterbutler,felliott/waterbutler,hmoco/waterbutler,RCOSDP/waterbutler,TomBaxter/waterbutler,rdhyee/waterbutler,CenterForOpenScience/waterbutler,Ghalko/waterbutler,icereval/waterbutler