Finish merging Spring Attack, Shot on the Run
Add Surge feats