Merged in new bullet commits - fixes sticky collisions
Too many various other changes