A kinetic flocking model with diffusion