I am surprised that the author did not consider Dell. I T410i user, but I will not be buying another thinkpad based on the current line up. Plus I have many issues with Linux drivers. Windows is no more reliable and I am forced to move on. Mac is great but the inability to modify is bugging me. I have a MBP also.
Of course, nothing beats a PC but its tough while travelling or when you just want to move around while working.
Micheal Dell making the company private will be good if he planning to focus on making quality hardware like Dell Developer Edition XPS + Project Sputnik, which is an interesting project. But still needs to mature.
So if I have to buy a machine today, I am lost. There is a need for quality machine for developers as we spend long time with it. It needs to be durable, light, matte screen(its very tough to get that now a days), low heat, good keyboard (mechanical like old thinkpads), good driver support for Linux, decent battery. PLUS have a higher score on iFixit. I like the rating of XPS 13 @ https://www.ifixit.com/Teardown/Dell+XPS+13+Teardown/36157