Improve salt bootstrap wrappers to let us specify roles and masters

Previously it *had* to be in the provider config. This lets us be more dynamic
for dynamic environments like AWS.