Optimized the redrawing of chunks so only chunks that need to be display list-ed are regenerated
Fixed minor merge conflicts