Added conditional statements to content.php to either show the_content or the_excerpt depending on the type of template it is on.