Updated 2014.03.X deps to 2014.07.1-SNAPSHOT
Updated 2014.03.X deps to 2014.07.1-SNAPSHOT
Merge branch 'develop' of https://github.com/maksimov/dasein-cloud-aws into develop

Conflicts:
	pom.xml
Re-enabled integration tests
Merge pull request #127 from maksimov/develop

Updated 2014.03.X deps to 2014.07.1-SNAPSHOT
Merged TWC Changes
Merge pull request #79 from greese/develop

Pull in Dasein upstream
Merge pull request #80 from TheWeatherCompany/merge_upstream

Merge upstream
Merge branch 'develop' into issue-670
Renamed certificateName (ServerCertificateName) -> certificateId, certificateResourceId/arn (Arn) -> providerCertificateId, certificateId (ServerCertificateId) - ignored (#670)