GH #180 - Custom options are now read into dicts.
Merge branch 'dsuch-f-gh180-read-openstack-swift-custom-options'
Merge branch 'master' into dsuch-f-gh179-add-amazon-s3
GH #179 - Added new security type - AWS definition.