Merge pull request #2623 from efiring/include_order

setupext: put pkg-config -I, -L, -l locations at the head of the list
Merge pull request #2644 from arokem/license_typo

Small typo in the license.
Fix #2636: Non-ascii characters coming from TeX are wrong
Merge pull request #2636 from mdboom/font/unicode-python3-pdf

"\usepackage[russian]{babel}" does not work in matplotlib 1.3.1
Use IPython's copy of ipython_console_highlighting if it is available.
different fix for comparing sys.argv and unicode literals

cast literals to str instead of inappropriate use of six.u (#2534)
NF - see axes.get_label() when clicking on Edit curves lines and axes parameters after plt.show()
Merge pull request #2656 from mdboom/use-ipython-console-highlighting-if-available

Use IPython's copy of ipython_console_highlighting Sphinx ext, if available
Merge remote-tracking branch 'upstream/v1.3.x'

Conflicts:
	doc/conf.py
Deprecate IPython-related Sphinx extensions
Use matplotlib.cbook.warn_deprecated
Add CHANGELOG entry.
Merge pull request #2671 from mdboom/deprecate_ipython_directive

Deprecate IPython-related Sphinx extensions
Fix typo in _axes.vlines doc-string
Merge pull request #2676 from magnunor/fix_typo_vlines_doc

Fix typo in _axes.vlines doc-string
modified example to reflect removal of NavigationToolbar2QTAgg
house keeping for #2629

Added NavigationToolbar2QTAgg back with a deprecation warning

Added entry to api_changes.rst
Merge pull request #2661 from rtrwalker/display-axes-label-when-editing-curves

NF - see axes.get_label() when clicking on Edit curves lines and axes pa...
Merge pull request #2657 from minrk/sys-argv-mybad

different fix for comparing sys.argv and unicode literals
fix depreciate -> deprecate