Update pie_demo_features.py

line break added before "plt.show()" line
Update spines_demo.py

Line break added before "plt.show()"
Remove trailing backslash as pointed out by @dmcdougall
Don't use the font cache on TRAVIS
Merge pull request #2132 from mdboom/font_cache_fix

Attempt to fix Travis tests by not using font cache there.
Tagging v1.3.0rc3 relase
Don't install the KnownFailure nosetest plugin as a pkg_resources entry_point, as it can, under some circumstances, conflict with the one in IPython.  This means that the supported method to run the tests is from the tests.py script or `import matplotlib; matplotlib.test()`.
Don't create a subclass of pep8.StandardReport when pep8 isn't installed
Make the KnownFailure plugin work when the tests are run in parallel
Merge pull request #2141 from mdboom/handle-pep8-missing

Handle pep8 missing
Merge pull request #2139 from mdboom/dont-install-nose-plugin

Don't install the nose KnownFailure plugin as a pkg_resources entry_point
Tagging 1.3.0rc4
Don't add a setup.cfg to the tarball
Merge remote-tracking branch 'upstream/v1.3.x'

Conflicts:
	lib/matplotlib/__init__.py
Merge branch 'tidy_examples'
brought backend_qt4.py into pep8 compliance.

Not confident that the change to line 399 is the correct thing to do
here.
brought ../backends/backend_qt4agg.py into pep8 compliance
brought qt4_compat.py into pep8 compliance
minor indentation fix