Update 1.8.x rackspace-cloudfiles to use non-labs swift

#160 needs an extra commit due to drift between 1.8.x and master