manual migration of

https://github.com/unwin/dasein-cloud-google/tree/develop+RDS
which was a very very ugly merge due to being 2 weeks behind.