Syncing with vip

Noticed a small edge case bug in code that came down from VIP, fixed that and added tests.
Generally I agree. There's a good reason for keeping it readable when possible: you can browse data in redis/memcached/etc. Using {term_id}_{taxonomy} means being able to understand the data you're browsing.