Master

merges autocomplete branch into master, as well as adding support for usernames with separators "@user.name"