rewrite with reflux
Merge branch 'master' into gh-pages
blah, hacky fix for some races
Merge branch 'master' into gh-pages