Automated merge with https://bitbucket.org/categoricaldata/categoricaldata
Automated merge with https://bitbucket.org/categoricaldata/categoricaldata

JasonGross/categoricaldata,JasonGross/categoricaldata