Fixed failing bbox_inches='tight' case when a contour collection is empty.
Removed the import from cbook into the matplotlib name space in __init__
and changed all cases of

from matplotlib import MatplotlibDeprecationWarning as mplDeprecation

to

from cbook import mplDeprecation
tweaked intra-package imports from cbook
Fixed background colour of PNGs saved with a non-zero opacity.
Merge pull request #1946 from tacaswell/mpldeprec_imports

re-arrange mplDeprecation imports
Have a workaround if a Python 3 user has pyparsing <= 2.0.0
Cleanup formatting of setup messages
Make the travis output slightly quieter, particularly when installing dependencies.  Add Python 3.3 to the tests.
Merge pull request #1965 from mdboom/simplify-travis

Make the travis output quieter on v1.2.x
Bug if MPLCONFIGDIRS is set
Switch agg backend to use pixfmt_rgba32_plain instead of pixfmt_rgba32, which fixes a problem with alpha-blending partially transparent backgrounds.
Merge pull request #1868 from pelson/alpha_background

Fixed background colour of PNGs saved with a non-zero opacity.
Fix position of rotated text in Agg backend
Merge pull request #1968 from mdboom/rotated_text

Rotated text element misalignment in Agg
Merge pull request #1929 from pelson/bbox_inches_contour_problem

Fixed failing bbox_inches='tight' case when a contour collection is empty
Update pngsuite.png test image
Fixed failing bbox_inches='tight' case when a contour collection is empty.

Conflicts:
	lib/matplotlib/tests/test_collections.py
SubplotBase._make_twin_axes always creates a new subplot instance. Fixes #1957.
Fixes imsave so it does not flatten alpha-channel data (and updated test to match)
Skip over zero-length subpaths.  Calculate for each subpath and then "or" those results together.