Use upstream winston rather than our fork

They’ve merged my pull request, so stop using our fork. Essentially this
change removes the ugliness from
abbfaa6eed650f783a64c769d72c01f7a3401fcc.