Battleshock is still taken, it's just as a warband now, so you might see some of those abilities that affect battleshock stacking.
As for Master of Black Arts, the command trait makes your general a wizard, but it doesn't say how many spells it may attempt to cast or unbind, rendering it...