Update cli to use the new MergeConfigMixIn.

The purpose of the above MixIn is to override the options on the configuration file with the options passed from the console.

saltapi/cli.py

@@ -6,6 +6,7 @@ from salt.utils.parsers import (
     ConfigDirMixIn,
     DaemonMixIn,
     LogLevelMixIn,
+    MergeConfigMixIn,
     OptionParser,
     OptionParserMeta,
     PidfileMixin)
@@ -15,8 +16,9 @@ import saltapi.client
 import saltapi.config
 import saltapi.version
 
+
 class SaltAPI(OptionParser, ConfigDirMixIn, LogLevelMixIn, PidfileMixin,
-        DaemonMixIn):
+              DaemonMixIn, MergeConfigMixIn):
     '''
     The cli parser object used to fire up the salt api system.
     '''