Initial output in new format, plus some minor bug fixes.
Initial output in new format, plus some minor bug fixes.

RackerWilliams/attributeMapping,RackerWilliams/attributeMapping,RackerWilliams/attributeMapping,wdschei/attributeMapping,wdschei/attributeMapping