This should help the buildbot on older platforms
BF:A bug in version 1.3 of matplotlib leads to infinite recursion.
We patch things up here, by adding the relevant piece of code into our
distribution.
The fixed piece of code is taken from here: https://github.com/matplotlib/matplotlib/pull/2591/files
BF: Need this file to be in place for that to work.
Added license/copyright for mpl
Getting rid of some non-ascii chars.
Merge pull request #122 from arokem/mpl_units_patch

Mpl units patch
This should help the buildbot on older platforms
Merge pull request #114 from arokem/buildbot-mpl

This should help the buildbot on older platforms
BF: coherence testing needs to be done with Welch method.
Merge branch 'buildbot-mpl'

Conflicts:
	nitime/algorithms/tests/test_coherence.py