Pull stuff for next deployment out of dev

Phew... I think I got everything...