Fix ObjectStore being incompatible with CDN-less setups, such as most non-rackspace openstack setups.
Fixed some style issues.
Merge pull request #238 from CloudVPS/fix_cdnless_openstack

Fix ObjectStore being incompatible with CDN-less setups