Fix issues causing php and page redirection errors on 404s
Fix php errors/warnings when current post/page information is included in a theme's header area, prior to the WPeC query swap.
Fix php errors/warnings when using ThemeFoundry's "Make" theme

Conflicts:
	wpsc-components/theme-engine-v1/helpers/template.php
Fixed line deleted as a result of an incorrect rebase
Merge pull request #1558 from JeffPyeBrook/pr-404-errors-and-make-compatibility-rebased

Fix issues causing php and page redirection errors on 404s