Updated to match Salt's setup method.
Updated to match Salt's setup method.

MjAbuz/usesthis,MjAbuz/usesthis,ivuk/usesthis,holman/usesthis,orta/usesthis,holman/usesthis,orta/usesthis,ivuk/usesthis,waferbaby/usesthis,waferbaby/usesthis,MjAbuz/usesthis