Some values were not formatting nicely, so chose to use a regular
expression to strip trailing zeros plus the sugar format function.
Merge pull request #349 from mbucknell/NAWQAAN-384

Some values were not formatting nicely, so chose to use a regular