Switch which to hash, and fix colors.
Merge pull request #1 from xplinscott/use-hash

Switch which to hash, and fix colors.
Merge pull request #1 from superjer/master

Update from upstream.