Merge pull request #37 from jpecht/master

Added categorical support
fixes to companions
Merge remote branch 'origin/master'
Merge pull request #38 from jpecht/master

fix grey area for categorical
highlight error fixed
Merge remote branch 'origin/master'
companion values now show in tooltip
Merge remote-tracking branch 'upstream/master'