Removed version file
Moved netapi modules to the regular Salt-core module-type level
Moved APIClient class to netapi modules subdir
Merge pull request #13548 from gtmanfred/apply_sdb

add apply_sdb function
Renamed APIClient to NetapiClient to avoid ambiguity

Renaming pre-merge to avoid post-merge ambiguity with the unfortunately
named salt.client.api.APIClient(). Sometime in the future netapi modules
are likely to be rewritten to use salt.client.api.APIClient() instead.
Moved the remaining saltapi/*py files so they conflict during merge

This moves the remaining salt-api machinery files into the correct
places for the merge to Salt-core. Some of these files will conflict on
purpose since they will need to be manually merged. <evil laugh here>
Removed redundant docs files with Salt-core docs
Moved salt-api release notes into saltapi subdir
Renamed netapis to netapi
Updated the netapi modules index to be more clear
Update the rest_wsgi module docs for moar warnings!

I had planned to move this module into salt-contrib during the merge to
Salt-core. It is useful to have a zero-dep REST interface for making
simple API calls though. Instead of removing the module, I've added more
warnings about how NOT to use it. <shrug>
Updated all saltapi import paths to salt.netapi
Removed debian rules file; will conflict
Merging in the awesome work @westurner added to debian_ip.py for improved support for Debian & Ubuntu networking.  A bit of additional cleanup.
Merged salt-api into Salt

Woot!

The conflicts below are intentional because they contained salt-api-isms
that needed to be included into the corresponding Salt files.

Conflicts:
	debian/changelog
	debian/control
	doc/conf.py
	doc/index.rst
	opt_requirements.txt
	salt/config.py
	salt/loader.py
Added salt-api to setup.py
Added httpdomain from Sphinx-contrib
Fixed loader search path for netapi modules
Removed accidental addition to rest_cherrypy tools module
Removed module-level debug log from rest_cherrypy module