Fix #1885: Text clipping should always set the patch to the axes, regardless of the state of the clip_on kwarg, so that clip_on can be toggled after the fact
Addresses fixes #1871 by making `axis.set_scale` private and adding
a wrapper function with depreciation warning.
Have a workaround if a Python 3 user has pyparsing <= 2.0.0
Updated default quit keymap to include cmd+w so people running on OS X would have a native cmd+w to close the window.
Spelling and import tweaks it axis.py.
wx backend should not attempt to render jpeg/tiff if PIL is present.

If PIL is present, the wx backend needs to allow the base class to get the
job done for print_jpeg and print_tiff, instead of trying to take over
duties itself.
Fixes issue #1960. Account for right/top spine data offset on transform when doing spine.set_position(). Also includes a testcase for the data locations.
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
Improved comment for data spine transform adjustment - taken from mdboom.
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
figure: optionally configure automatic use of tight_layout
Added bullet to api_changes documentation on PR #1964
add test for automatic use of tight layout
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