Update number-format.js

Corrects bug where currency suffix was overwritten by SI-prefix formatting.
Updated test/locale for suffix bug
Merge branch 'master' of github.com:jbblanchet/d3 into fix-prefix
Tweak comment. Add another test.
Merge branch 'fix-prefix'