More sugar

Signed-off-by: Ken Barber <ken@bob.sh>
Work required for rspec-system-puppet ver 2 work

Signed-off-by: Ken Barber <ken@bob.sh>
Some improvements to display

Signed-off-by: Ken Barber <ken@bob.sh>
more work

Signed-off-by: Ken Barber <ken@bob.sh>