clean up
Merge branch 'master' of https://github.com/cbrucks/rackspace_cloud_files