added categorical datatype capability
Merge remote-tracking branch 'upstream/master'
Merge pull request #37 from jpecht/master

Added categorical support