fixed a few lingering d3.v3 issues
Merge branch 'development' of https://github.com/novus/nvd3 into development

Conflicts:
	nv.d3.js