Merge pull request #2 from jhmartin/patch-1

apply us-east-1 ami to stack.json

Update stack.yml

Revert change to sinatra service X-Conflicts setting

Remove /bin/bash and properly substitute $COREOS_PUBLIC_IPV4

Update systemd units to use $COREOS_PUBLIC_IPV4 instead of grep/awk magic. Thanks @brianhicks and @bacongobbler

Initial commit