ENH: replace pandas hack, add support for old matplotlib and current pandas master
Merge pull request #789 from dengemann/pandas_maint

ENH: replace pandas hack, add support for old matplotlib and current pandas master