Dev/kwiver integration

I merged Kyle's branch from #1 for this.