Misc Update

Reformatted/moves elemental affinities
Added feat/misc affinities
Added healing surge and action point macros to combat lib
Updated various campaign macros