Merge pull request #131 from TheWeatherCompany/develop

Add missing machine types, remove deprecated machine types, support for getting userdata
Recursion bug, optimisations, formatting.
FB 4309: correct max IOPS is 4000
Merge pull request #134 from maksimov/develop

Recursion bugfix, FB 4309
#94 Added stateReasonMessage to VirtualMachine
Merge pull request #82 from TheWeatherCompany/issue-94

#94 Added stateReasonMessage to VirtualMachine
XML streaming added to public image search to avoid OOP.

Conflicts:
	src/main/java/org/dasein/cloud/aws/RegionsAndZones.java
	src/main/java/org/dasein/cloud/aws/network/ElasticIP.java
	src/main/java/org/dasein/cloud/aws/platform/RDS.java
Merge pull request #137 from maksimov/develop

XML streaming added to public image search to avoid OOP.
TheWeatherCompany/grid-api/issues/#722

Return userData value for instances in plaintext
Revert "TheWeatherCompany/grid-api/issues/#722"

This reverts commit 71fb611bf61fd20b87b84d5b842c210865ffceff.
Merge pull request #84 from greese/develop

Merge Dasein upstream.
TheWeatherCompany/grid-api/#722
Merge branch 'develop' into issue-670

Conflicts:
	src/main/java/org/dasein/cloud/aws/network/ELBMethod.java
Simplified SSL certificates API: got rid of SSLCertificateMetadata; setting SSL on LB takes certificateId instead of Arn (#670)
Fixes in error handling for SSL certificates; using sslCertificateId in LbListener instead of Arn (#670)