saltstack/salt — pull request #14145 by terminalmage (2014-07-11 20:52:43+00:00)
Title: Couple ioflo fixes

Per conversation with @thatch45. Details in commit msgs.