contact_us_2_column_bug

There's a bug where a site with a 2-column layout shows something in column 2 (Announcements, Calendar) on the page when you go to the Contact Us tool.
I'm setting the layout to be 1-column when it's the Contact Us tool.
Merge pull request #25 from ox-it/contact_us_2_column_bug

WL-3591 Don't inherit two column from the original page.