Merge branch 'master' of github.com:imduffy15/ec2stack into run-instance