Change local client args preps into kwargs
Change local client args preps into kwargs

I am doignthis because it is cleaner, but primarily because it
will be easy to integrate the external auth system

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt