Fix pdf_use14corefonts test
Fix tests
Merge pull request #454 from mdboom/xdg_config

Use a subdirectory of $XDG_CONFIG_HOME instead of ~/.matplotlibrc on Linux
Merge pull request #2050 from pelson/colormap_api

Added the from_levels_and_colors function.
Fix PEP8 whitespace issue
Merge remote-tracking branch 'upstream/v1.3.x'

Conflicts:
	lib/matplotlib/colorbar.py