Merge gil's distance_field and collision_distance_field updates

What does it take for something like this to get merged?