Json marshal fix

The & is being escaped  in the json.Marshal and MarshalIndent
This is causing a problem rebuilding json object if any ampersands exist in any fields
Replace the escaped character with the actual & (Ampersand)