Merge pull request #7 from SDK-CLI-Docs/feature/92_temp_urls

Feature/92 temp urls
Merge pull request #8 from SDK-CLI-Docs/feature/130_windows_instances

Feature/130 windows instances
Added parsing for Marker.  AWS limits response to 100 lines and gives you a marker to get the next batch with
fix indexed_param usage
Merge remote-tracking branch 'upstream/master' into extend_create_image
forgot to commit some changes
Merge pull request #1190 from boardnutz/master

Added Marker to Elasticache and RDS describe_events
Update the get_windows_password to return the encrypted password instead of the decrypted one.
Merge pull request #9 from SDK-CLI-Docs/feature/141_extract_win_password

Update the get_windows_password to return the encrypted password instead...
Merge pull request #1189 from estonfer/extend_create_image

Extend create image
Merge pull request #1164 from frodenas/openstack-quantum

[openstack|network] Add support for OpenStack Quantum
Ignore existing directory when creating on local storage
Merge pull request #1194 from tfwright/bugfix/directory-create

Ignore existing directory when creating on local storage
Add config instructions to README
Fix reference to config file
Merge pull request #1196 from tfwright/enhance/readme

Add config instructions to README
modified create function to include options. changed "diskConfig" to "OS-DCF:diskConfig" to allow disk configuration to be properly set.
[Brightbox] Brightbox tests should select the smallest official image.
Merge remote-tracking branch 'brightbox/pick_smallest_image_for_tests'
Removed options attribute and used the already existing disk_config attribute instead. Passed in options hash to create_server method with disk_config attribute unless nil.