split each step more clearly
This reverts commit 5b8ed68c.
still haven't quite figured out how keys actually get to the puppet server yet.