Fix container format selection
Merge branch 'master' of http://github.com/mikalstill/cloudfiles-tools