Template & Style Additions

Shortcode additions
Conditional template stuff somewhat fixed
Directory pages fixed