Cleaned up pillar access for webservers.

Hi,

Can someone merge this please? Thanks

  fintan