Don't check for minions when 'order_masters' is set, ref #3986

Sorry for all the extra pep8 stuff, it was bothering me.

I also put in a small performance optimization at @thatch45's request.