Added .matplotlib.
Merge branch 'mac'