Updated emoticons, adding shitstorm, removing confluence