Adding salt_roles
Removing roles, using grains instead
Updating branch from master
Fxied grains template