Fixes Issue #63, Smarter User Autocompletes
Merge pull request #683 from learning-unlimited/issue63-cherrypick

Fixes Issue #63, Smarter User Autocompletes