filter users from search follow up, refs #447

fix form bugs from last commit, fix avatar resolution, tests (duh)
Merge branch 'master' into integration