saltstack/salt — pull request #19246 by cachedout (2014-12-24 03:35:17+00:00)
Title: More cleanup

cc: @thatch45 and @s0undt3ch Please review carefully, especially the change to the flo daemon.