Dev/kwiver integration

I'd rather this be a member if possible. Also whitespacing.