Stray whitespace removal and allow for empty pillars without state failing

Some minor fixes to avoid state failing if the pillar was missing or missing.

Using salt['get.pillar'] seems to be the better way to access pillars to get some free error handling as well.