I just got my new 15" machine with toolbar and the battery lasts, maybe 2 hours? Consumer Reports had said that the newest software update fixed the issue, but not for me. Any others having trouble out there? I'm giving Apple two weeks to fix this or I'm sending it back.