Fixed indenting
Add puppet master to hosts file automatically.

Also fix some more indenting.