feat(contrib/ec2): launch into vpc

Modifies the cloudformation configuration to create resources within the
confines of a VPC.

fixes #1005
fix(contrib/ec2): fix launching into VPC

To successfully launch into a VPC, we must specify the availability
zones associated with each subnet.
fix(*): fix etcd_safe_set to not override values

Refactors etcd_safe_set so it doesn't overwrite custom settings.

TESTING: rebuild and restart components, setting a non-default
custom value
```console
dev $ make uninstall
dev $ vagrant rsync && make build
dev $ vagrant ssh
coreos $ etcdctl set /deis/controller/webEnabled 1
dev $ make run
```
Make sure the settings have taken effect.

Changes proposed by @aledbf

fixes #1210
fix(controller/registry): add old config vars

In child images, we weren't dumping the old config variables from
previous images. This would fester and would run into issues such as
environment variables going missing. Adding them back solves this issue.
Merge pull request #1232 from deis/aws_vpc

feat(contrib/ec2): launch into vpc
Merge pull request #1212 from deis/fix_etcd_safe_set

fix(*): fix etcd_safe_set to not override values
Merge pull request #1336 from deis/1326-container-config

fix(controller/registry): add old config vars
fix(integration): modify client to take input from stdin

To test the gexpect feature but g expect is not working so reverted the change
fix(client): change account spelling in deis auth cancel
test(integration): add basic working framework files
fix(client): change account spelling in deis auth cancel
test(integration): working versions of auth and keys commands
test(integration) : vendor json library and adjust indentation
test(integration) : working integration tests

Vendored Gexpect
test(integration) : minor bug fixes
test(integration) : add utils support to perms_test.go
test(integration) : Add integration Test for issues #1136 #1239.

Removed Example play app as its taking too much time for tests to run .
Added CURL test for each test that launches an app