Fixed merge conflict
Merge branch 'develop' of https://github.com/greese/dasein-cloud-aws into develop
Merge branch 'develop' of https://github.com/greese/dasein-cloud-aws into develop
Minor fixes to make it compile
Merge pull request #108 from andylyall/develop

Minor fixes to compilation errors