I have been a windows user my entire life, but have decided to switch to Apple. I have been looking into mac products now for the last couple of months. I was going to go with a 13" MBP if is had a bump in resolution and was still able to be upgraded by a third party. I was also waiting for the ivy bridge chips. After WWDC today, I saw that the 13" was still unchanged as far as the display, and I don't think the current resolution is going to do it for me. So, I looked at the Macbook Air. Everything looks great, except the hardware is not able to be upgraded (RAM & SSD). Also, I heard that a retina 13" will be coming out this August, which is very tempting, but I also don't want to pay $400 extra for a nicer display. I am a college student that will be doing word processing, a little programming, email, and some cad. Any thoughts on witch I should go with?