Fix for XML ampersand bug.

Also included journals in easybib.