eliminate @MIME deprecation warnings
Merge branch 'master' of git://github.com/stevengj/PyPlot.jl