Fix: Add compat code for pd.Categorical in pandas>=0.15
Merge pull request #1884 from JanSchulz/cat_fixes

BUG: Add compat code for pd.Categorical in pandas>=0.15