On another note, I am mildly concerned that Weapon Mastery is being spread around so much. It is popular, but I felt it would be most appropriate as a feature that is strictly for Warrior Classes, and this makes the distinction of what is or isn't a Warrior fuzzy.
Not that this is a big problem, just mildly concerning.