Update to OM 0.3.6, Sablono 0.2.6

And other fixes