Fix some stuff
Fix leftover colons from emoticons
Merge remote-tracking branch 'upstream/master'