Martial arts, part 2

Added 4 martial arts (krav maga, muay thai, ninjutsu, taekwondo) and one martial arts trait back, as well as adding a `quiet` flag to martial arts buffs. Addresses parts of #3208, #3185, etc