Merge pull request #3080 from khyox/master

Minor fix to commit 24bc071
Updated tests, and added a new test for PathEffectsRenderer points_to_pixels.
Improves description the return value from plt.hist()
added missing cleanup on testbench function
Merge pull request #3081 from pelson/points_to_pixels

Points to pixels
DOC : Added CHANGELOG entry
Merge branch 'font-manager-state'
Improves docs to be more like numpydoc
Formats return values as suggested
Merge branch 'patch-1' of git://github.com/Tillsten/matplotlib into Tillsten-patch-1

Conflicts:
	CHANGELOG
Merge branch 'Tillsten-patch-1'
Removes extra space and space on line endings
Added functionality for plotting the actual violin bodies to violinplot.
Added ksdensity (KDE) function in mlab and adapted _axes violinplot function to accept new KDE.
Added basic violinplot demo in examples
Added statistics lines to the violinplot function.
Added horizontal violin plot feature compatible with means, extremas and medians.
Fixed bug for regression test #1181 in scipy unit tests; ksdensity is now referred to as gaussian_kde and exists as a class in mlab.
Fixed list comp position bug and updated examples
Reverted 69b304c.
Re-added points parameter to violinplot.
Fixed several style issues.
Merging for pep8 compliance for mlab's GaussianKDE