added failing test
slight tweak to example, as discussed in #1451 to change `plt.draw()`
-> `plt.pause(.001)` to fake animations.
BUG: correctly convert labelsize -> int

Do this by getting the size value back from the underlying text
object.
Merge pull request #2619 from tacaswell/issue_1451

slight tweak to mpl_example
Merge pull request #2618 from tacaswell/fix_issue_1172

Fix issue 1172
Fix for when pyparsing isn't present

Conflicts:
	setupext.py
Merge pull request #2639 from bulli92/master

BUGFIX: ensure that number of classes is always of type INT in Colormap
Merge remote-tracking branch 'upstream/v1.3.x'

Conflicts:
	lib/matplotlib/axis.py
	lib/matplotlib/tests/test_axes.py