Added common setup
Merge branch 'develop' of github.com:scaryclam/saltconfig into develop