Fixed up xml reporter and rebased
Added type attribute to xml reporter output

- reports the macro used
build 12

- includes updated xml reporter