Merge branch 'develop'
Merge branch 'develop'
diskv.Keys() now takes an argument

Signed-off-by: Adam Jimerson <vendion@gmail.com>