Dustin Johnson masters annus horribilis to return to the top