Adding in missing Metada removed by previous commits

Great job on reducing the redundant bulk in the masterlist.  There seems
to be a lot of missing '- type:' and 'content:' lines though.  If your
using any regex commands, see if there might be a way to still use it
and not loose that needed data.