Updated the code to match SC7 package

Updated the code base to match the Sitecore 7.0 package from
LaunchSitecore.net.
Added missing items from previous checkin