fix XML creation bug where 'None' inserted
fix text elements widths in map/layer, refs #470

this also cleans up the inconsistent width on the metadata elements
Merge branch 'master' into integration