Ugh, reorder combine after smap*.
Merge branch 'master' of github.com:aphyr/riemann