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.
Merge pull request #51 from s0undt3ch/hotfix/make-logfile-logging-work

Hotfix/make logfile logging work
Added logging output if the rest_cherrypy module is partially configured

Added minimum version check for CherryPy.

Fixes #38
Fixes #48
Provide `salt-api`'s configuration defaults. Refs #52.

We now override the necessary keys to adapt the salt-master default configuration to salt-api and feed that to `salt.config.master_config`.
There no need to do our own `include` code since that's also done in `salt.config.master_config`.
Merge pull request #53 from s0undt3ch/issues/52

Provide `salt-api`'s configuration defaults. Refs #52.
Formatting / clarification cleanups
Added explicit heading so the heading shows up in TOC entries
Added more docs; clarified usage of the REST module
Rename CherryPy app to app.py

This move is to facilitate being able to start the WSGI app with other
WSGI-compliant servers.
Factor out starting the CherryPy server
Added stand-alone WSGI app
Ignore PyCharm files.
Merge pull request #57 from holmboe/develop

Ignore PyCharm files.
Updated file to be conform to Fedora packaging standards.
Merge pull request #60 from kaptk2/develop

Updated file to be conform to Fedora packaging standards.
Add a test suite.

More information in maillist thread:
https://groups.google.com/d/msg/salt-users/JIZoC4wVVag/_yAhZuD_c6sJ
Add requirements for install and tests.

Note that I have set the requirements to the lowest version of salt and cherrypy that I have tested with, feel free to change this.
Fix typo.
Merge pull request #62 from holmboe/test-suite

Add a test suite.
Fixed inconsistent workding