Dev/kwiver integration

On Mon, Aug 25, 2014 at 09:01:47 -0700, linus-sherrill wrote:
> I don't see this on master. Did it not get pushed or is it on another branch?

Oops; didn't push. Done now.