Merge pull request #37 from hlindberg/master

ARM-4 Heredoc Update to Version 2 - ready for submission
Updating Capabilities Armature

The main document was previously a long description of something
more like philosophy, and now it's a more clear description
of what I think we should do and why, with examples.

I've also removed my old description, as it was too free-form
and had some contradictory information in it.

Note that the Armature templates do not actually talk about content
itself.  They talk about some basics, but you can't take the templates
and usefully build an armature from them.

Signed-off-by: Luke Kanies <luke@puppetlabs.com>
Merge pull request #38 from lak/modified_capabilities

Capabilities Armature Update 3
(ARM 3) Update ARM 3 Puppet Templates to 1.0.0

This concludes a series of edits fixing details in the text to make
it use the new arm template and describe how the reference
implementation works. 

Earlier resolved discussions embedded in the text are removed.