Honestly I'd prefer entropy to not be overloaded to do K-L divergence, but I guess this would be hard to change for non-technical reasons.  When I see `entropy(p, q=None)` I expect it to do [cross entropy](http://en.wikipedia.org/wiki/Cross_entropy) when `q` is specified, not K-L divergence.  But this is getting off topic..