Merge branch '2014.05' of https://github.com/greese/dasein-cloud-google ...

...into 2014.05