Dev/kwiver integration

Excess whitespace (same sprinkled around).