Asterales catch up

I did some work on push_api, and made a few other tweaks. I didn't finish doing an end to end test with a treemachine database and everything else. I think it's safe to merge this, but if you're feeling nervous you can wait until I've finished testing. But that may be a while...