Simplify avatar lookup class
Merge branch 'simplify_avatar_lookup' of github.com:stephankaag/discourse-1 into simplify_avatar_lookup

Conflicts:
	lib/avatar_lookup.rb