Updated pillar and cleaned beaver.conf jinja template