Started some integration tests for mac_user module
Removed references to internal region terminology
Reuse Channels

with support for multiple ttypes

Submitting merge request to get jenkins run. Last time this was merged there were some problems which seem to be related to this but i'm unable to reproduce them locally-- so hopefully we can get something from Jenkins :)
Merge branch 'develop' of github.com:CaptTofu/salt into develop

Conflicts:
	doc/topics/cloud/hpcloud.rst
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Wrote a mac_user integration test
Fixing ini_manage module to preserve empty options. Added unit test for module to verify there are no regressions.
Fixing formatting in ini_manage_test.py.
Fix various "DeprecationWarning, module not renaming, just have __virtual__ return True" messages
check to see if a partition exists
PEP8
pylint fixes
remove local cmd, the router sends them to the workers
Merge pull request #11152 from dmyerscough/develop

check to see if existing partitions exist
enter the setup frame before moving to the master udp frame
Get workers to start
more safely connect to the manor yard in raet events
Add in the access keys needed by localfuncs
no need to inbound twice
gate worker tracker creation