Gh426 list keys include type

The Location returned from listkeys was not getting the
correct type if it wasn't 'default'

Fixes #426