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
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.
Merge pull request #84 from greese/develop

Merge Dasein upstream.