some tidying in the EP likelihood

Changes self.N to self.num_data for consistency with everywhere else
added the factor of 2pi to Z.