Replaces subfig with caption so we can also use subcaption.

subfig is deprecated and we shouldn't be using it.