Merged changes from develop
Merge branch 'develop' of https://github.com/greese/dasein-cloud-aws into develop
Merge branch 'develop' of https://github.com/maksimov/dasein-cloud-aws into develop

Conflicts:
	src/main/java/org/dasein/cloud/aws/storage/Glacier.java
	src/main/java/org/dasein/cloud/aws/storage/S3.java
Merge pull request #107 from maksimov/develop

Some lost commits
Merge branch 'develop' of https://github.com/greese/dasein-cloud-aws into develop
Minor fixes to make it compile