Add Stephen Johnson - Puppet infrastructure proposal.
Drop Brandon's withdrawn proposal.
Merge pull request #69 from jbraeuer/master

Proposal updates (+1, -1).