Automated creation of the EC2 AMI
Merge remote-tracking branch 'origin/master' into aio_node_ami
Code review comments
Merge remote-tracking branch 'origin/master' into aio_node_ami
Merge pull request #38 from Metaswitch/aio_node_ami

Reviewer: Andy: Script the creation of an AMI