:lipstick: Don't need schema for proxy host
pom changes for merge
Merge pull request #93 from TheWeatherCompany/develop

Merge in changes for IAM SSL Cert changes
Merge pull request #153 from TheWeatherCompany/upstream-merge-2014-05-13

TWC Changes 2014 05 13
Provisions for EC2/VPC differences in handling EIP in or outside VLAN context.
Merge pull request #154 from maksimov/develop

Provisions for EC2/VPC differences in handling EIP
POM conflict -- took TWC changes
Merge branch 'greese-develop2' into merge-down-2014-05-23
WIP LBHC

Conflicts:
	pom.xml
	src/main/java/org/dasein/cloud/aws/network/ElasticLoadBalancer.java
Removed redundant deprecated methods

Conflicts:
	src/main/java/org/dasein/cloud/aws/network/ElasticLoadBalancer.java
New LB API methods implementation.

Conflicts:
	src/main/java/org/dasein/cloud/aws/network/ElasticLoadBalancer.java
Updated for the renamed HealthCheckOptions

Conflicts:
	src/main/java/org/dasein/cloud/aws/network/ElasticLoadBalancer.java
Fixes for bugs discovered by new tests.

Conflicts:
	pom.xml
	src/main/java/org/dasein/cloud/aws/network/ElasticLoadBalancer.java
Finalising LBHC changes
Merge pull request #156 from maksimov/develop

Develop
Merge pull request #97 from greese/develop

Merging last minute Dasein upstream changes into TWC
Stubbed in method so we can compile

ElasticLoadBalancer.createLBWithHealthCheck() added so we can compile.
Appears Dasein develop branch work isn't always entered wholly across
projects.
Merge pull request #96 from TheWeatherCompany/merge-down-2014-05-23

#98 Merge upstream Dasein changes into TWC fork.