Add raet_int to opts
More concise fix for empty /etc/hosts line check
Don't die on ioflo import
Add test for salt.config.get_id() when /etc/hosts is parsed

This is a WIP, the mocking isn't quite working yet.
Merge pull request #10714 from terminalmage/fix-etc-hosts-parsing

More concise fix for empty /etc/hosts line check
Get `mock_open` working.

Kind of since we're not using `mock_open` from the mocked library. Were
actually using the recipe to mock the builtin open as seen on http://goo.gl/dxMwPO
Run windows specific code on windows only!
Test is now fixed.
More concise fix for empty /etc/hosts line check
Add more get_id tests + some DRY fixes
Merge pull request #10724 from terminalmage/tests

Add three tests for minion_id generation
Revert "ZMQ topics"

This reverts commit 83a725ffb010c11b4c3cefe5ed8a969d9913c56f.

Conflicts:
	salt/exceptions.py
	salt/minion.py
bump windows installer version number
Merge pull request #10729 from UtahDave/develop

bump windows installer version number
finish revert of list target breaks
fix bad imports that are breaking the master
more structure fixes to ioflo stiuff
change ioflo pathing
ioflo behavior path changes
update the setup.py for daemons/flo dir rename