[#2178] Fixing bad reference to /components/yaml
[#2067] Tweaks to new remove "AcmeDemoBundle" entry

Biggest change was to rearrange steps so that all of the required steps are first, and the optional step (which doesn't apply to AcmeDemoBundle) is last.