Minor: import clean-up is the only change in kite-data-crunch. I like keeping these things fixed, but as separate commits directly to master. Otherwise the merge looks like it touched more than it really did.