Fixed the normaliser regex to recognise numbers better.
Updated volume to correctly recognise litres.
Updated unit to pass in the correct 'new_val' so 1kg = 1000g
The last commit message was for this one :P
Merge pull request #2 from liketoseeyoutry/fixing-token-parsing

Fixing token parsing