fix(coreos): remove refs to obsolete update-engine-reboot-manager

This was removed from CoreOS a while ago, so our unit file was having
no effect.
https://github.com/coreos/update_engine/pull/28
fix(contrib/ec2): add json extension to cloudformation template

The CloudFormation Template has a .template extension although its a json file.
This makes it difficult to parse/edit it as editors dont recognize it as JSON file.
So added the .json extension behind its name and also updated gen-json.py which
uses it.
fix(contrib/ec2): add script to update the CloudFormation
fix(controller/procfiie): Removed Procfile as its not used anywhere
Merge pull request #1308 from developerinlondon/fix/remove-procfile-from-controller

fix(controller/procfiie): Removed Procfile as its not used anywhere
Merge pull request #1304 from developerinlondon/fix/add-json-extension-to-cloudformation-template

fix(contrib/ec2): add json extension to cloudformation template
Merge pull request #1302 from ddollar/ec2-cloudformation-update

fix(contrib/ec2): add script to update the CloudFormation
fix(tests): increase component test timeouts to 20min

Most component test failures in our CI system recently have been due
to the tests taking longer than the default Go testing package timeout
of 10 minutes. The tests are in progress, but Go kills the process
after 10 minutes and reports it as failed.

The tradeoff here is that if one of the tests is actually stuck,
we wait twice as long to find that out, but overall this seems like a
fix for CI stability. Builder was increased to 30m since it takes much
longer to pull slugbuilder.
Merge pull request #1316 from deis/component-test-timeouts

fix(tests): increase component test timeouts to 20min
Merge pull request #1152 from deis/remove-update-reboot

fix(coreos): remove refs to obsolete update-engine-reboot-manager
Merge branch 'master' of https://github.com/deis/deis