Automated creation of the EC2 AMI
Merge remote-tracking branch 'origin/master' into aio-node-ami
Don't destroy /etc/clearwater/config if sed expression is bad
Merge pull request #18 from Metaswitch/cw-aio-config-fix

[Reviewer: Andy] Don't destroy /etc/clearwater/config if sed expression is bad
Merge pull request #16 from Metaswitch/aio-node-ami

Reviewer: Andy Script the creation of an AMI