Fixes #326, #331 and corrects markup issues with pull-request #390.
Also added check for theme_shortcodes.php for including batches of theme shortcodes.
theme_config.php is now the correct file name for a theme config.