Add option to get individual KL and expectation terms
Fix bug in vae/kl.py