Why We Fight by Mike Martin is a great recent book about this. It argues that our tendency to war is indeed an effect of evolution but that the historic trend to us forming larger and larger groups has significantly reduced violence