Merge multidraws when possible
Improve world vbo surface order

This allows more multidraws to be merged