fixing merge mistakes from the past couple of merge actions: axis and force has all their parameters as functors in my copy of D3!
Merge branch 'master' of github.com:GerHobbelt/d3