Removes dependency on subfig

subfig is incompatible with subfigure and both are said to be deprecated. So,
leave it up to the user to choose between subfigure, subfig or subcaption