What Causes Vaginal Itching And Smelling?

Hi, I am 21 w/ a 1yr old and a boyfriend ive been w/ 7yrs off and on. Ive been tested consistently and everythings been fine except a abnormal papsmear, which after a neg colposcopy and ecg the dr said was from inflamation. Months later I notice a breakout of a few hair follicles, which were very itchy and caused vaginal swelling. It went away a few days to a wk later, but now seems to be reocurring just before every period. The appearance and symptoms did not match w/ herpes or warts, but reoccuring folliculitis. Could this be it or something else?