Remove test code
Add logic to format numbers and handle language=None
Use Jinja templating language to format numbers and add code for testing
Merge branch 'master' into dev