don’t float your page-wrap left. It screws up the margin: 0 auto; and doesn’t center your content on the page.
Also, make your page-wrap width 941px; instead of 940. That will pull your sidebar up. Or you can go the opposite direction and make your sidebar width 239px; since your 1px border on your main-content adds 1px to the width.