Updates based on recent 2.06 patch for SMF

Going through the recent update patch / bug fix, these are the changes as far as I can see for Elkarte.  The avatar changes were done in another commit and is already merged in master.

It would be good if another set of eyes went through that patch and make sure I did not miss anything or do an elk conversion wrong.