This will probably make ES tests a lot happier.

After refreshing indexes, wait for ES to claim it is ready to go again (yellow means there is a set of all data in some indexes, though not fully redundant yet.)
Merge pull request #668 from mythmon/patch-1

This will probably make ES tests a lot happier.