Is there a scientific discipline that studies the role of genes on behavior/personality traits?

Sure. Here is a link to the international society of psychiatric genetics: http://www.Ispg.Net/. Also, the field of developmental neuropsychiatry covers much of what is known relative to psychiatric disorders with developmental origins. One of my mentors at the johns hopkins kennedy krieger institute, dr. James c. Harris wrote an excellent book on the subject.