refactor master vagrant
refactor salt state to make it more extensible by pillar