Add support for metadata to def-map-type
Merge branch 'master' of github.com:markaddleman/potemkin into markaddleman-master
whitespace changes