Toronto Mayor John Tory unveils new six-step traffic plan