Fixed the bugs introduced by my previous commit relating to the formatting function property name.
Fixed indentation, aligning it with "standard" d3 code.
Merge pull request #3 from dcleao/master

Fix and cleanup