dont let uses set avatar if none has been set

move this logic else where
Merge branch 'master' of git://github.com/discore/discore-interface