Okay, I just checked three seperate grammar books that I happen to have (english/writing major in college) and two of them said it was optional, one said that you shouldn't put the comma before "and". Weird.