Martial Master isn't that great anymore. Fighter can what, get 5 daily uses of Barroom Brawler at levels 10-11 for a couple feats, and short of the very long feat chains, it works for most stuff he needs to pick up. And Martial Master trades out Weapon Training, locking the fighter out of stuff like Advanced Weapon Training>Item Mastery shenanigans.