Better unification of Facebook & email accounts

No danger of duplicate accounts now.