Merge branch 'release/v0.12.2' into develop
Add y_axis_format as a param in discreteBarChart - fix #54 from @gannetson
add example of linechart with different X-Axis #17
Add axis labels to scatter charts
Merge pull request #56 from davidbt/feature-axisLabel_scatterChart

Add axis labels to scatter charts
Add @davidbt to contributors
Use Jinja's Template Tests
Merge pull request #58 from prikhi/develop

Use Jinja's Template Tests
Allow to have custom formats in line charts
Merge pull request #60 from davidbt/feature-custom-format-lineChart

Allow to have custom formats in line charts
Fix for issue #61

Improve LinePlusBarChart documentation
Merge pull request #62 from oz123/develop

Fix for issue #61
Add @oz123 to contributors
bit of code refactoring
Merge branch 'develop' of github.com:areski/python-nvd3 into develop
Fix for issue #61

Improve LinePlusBarChart documentation
Add @oz123 to contributors
Add chart extras to template and add documentation
Add missing requirements

 * So that make build target works

 setuptools is redundant in requirements

 * If you distribute a file with setuptools (pip, virtualenv and so)
   It's OK to assume setuptools is pre-existing
Merge pull request #64 from oz123/develop

Add extra parameters to graphs and missing requirements