Lint puppetmaster.erb

Fix some tabbing issues and ERB tags not killing preceding whitespace

Change-Id: I0ae3ed3ebfa903d78e57782df241209e60ad08df