Fixups based on review from nwolfe
Fixups based on review from nwolfe

senior/trapperkeeper,camlow325/trapperkeeper,rbramwell/trapperkeeper,nwolfe/trapperkeeper,senior/trapperkeeper,nwolfe/trapperkeeper,puppetlabs/trapperkeeper,scotje/trapperkeeper