Forgot smileys, adding them. :)
Merge remote-tracking branch 'origin/master'
Wired up private messaging. Other improvements that I don't remember.