Temlpate settings user info should include avatar

This patch moves the avatar settings to withing the check for "user info" on a node tpe.

If you have user info sitched off, for e.g. stories, and have avatars switched on, a story will not show Pested By Fo on Bar, but will still show the avatar.
This patch changes the behavious to show an avatar only if:
* avatars are switched on AND
* the active node type has post info switched on.