GH #180 - Custom options are now read into dicts.
Merge branch 'dsuch-f-gh180-read-openstack-swift-custom-options'