LIPSTICK - fixed spacing
GCE RDS additions
Support for coreos added
Merge pull request #274 from unwin/develop+RDS_Sept_10

Develop+rds sept 10