Index: wp-content/themes/twentyeleven/author.php
===================================================================
--- wp-content/themes/twentyeleven/author.php	(revision 17669)
+++ wp-content/themes/twentyeleven/author.php	(working copy)
@@ -31,7 +31,7 @@
 						<?php the_author_meta( 'description' ); ?>
 					</div><!-- #author-description	-->
 				</div><!-- #entry-author-info -->
-				<?php endif; ?>								
+				<?php endif; ?>
 
 				<?php /* Start the Loop */ ?>
 				<?php while ( have_posts() ) : the_post(); ?>
Index: wp-content/themes/twentyeleven/content-aside.php
===================================================================
--- wp-content/themes/twentyeleven/content-aside.php	(revision 17669)
+++ wp-content/themes/twentyeleven/content-aside.php	(working copy)
@@ -11,7 +11,7 @@
 
 			<?php if ( 'post' == $post->post_type ) : ?>
 			<?php endif; ?>
-			
+
 			<?php if ( comments_open() ) : ?>
 			<div class="comments-link">
 				<?php comments_popup_link( __( '<span class="leave-reply">Reply</span>', 'twentyeleven' ), __( '1', 'twentyeleven' ), __( '%', 'twentyeleven' ) ); ?>
@@ -47,4 +47,4 @@
 			<?php endif; ?>
 			<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
 		</footer><!-- #entry-meta -->
-	</article><!-- #post-<?php the_ID(); ?> -->
+	</article><!-- #post-<?php the_ID(); ?> -->
\ No newline at end of file
Index: wp-content/themes/twentyeleven/content-featured.php
===================================================================
--- wp-content/themes/twentyeleven/content-featured.php	(revision 17669)
+++ wp-content/themes/twentyeleven/content-featured.php	(working copy)
@@ -48,4 +48,4 @@
 
 		<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
 	</footer><!-- .entry-meta -->
-</article><!-- #post-<?php the_ID(); ?> -->
+</article><!-- #post-<?php the_ID(); ?> -->
\ No newline at end of file
Index: wp-content/themes/twentyeleven/content-gallery.php
===================================================================
--- wp-content/themes/twentyeleven/content-gallery.php	(revision 17669)
+++ wp-content/themes/twentyeleven/content-gallery.php	(working copy)
@@ -31,7 +31,7 @@
 	<div class="entry-content">
 		<?php if ( post_password_required() ) : ?>
 			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?>
-			
+
 			<?php else : ?>
 				<?php
 					$images = get_children( array( 'post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999 ) );
@@ -44,7 +44,7 @@
 				<figure class="gallery-thumb">
 					<a href="<?php the_permalink(); ?>"><?php echo $image_img_tag; ?></a>
 				</figure><!-- .gallery-thumb -->
-				
+
 				<p><em><?php printf( _n( 'This gallery contains <a %1$s>%2$s photo</a>.', 'This gallery contains <a %1$s>%2$s photos</a>.', $total_images, 'twentyeleven' ),
 						'href="' . get_permalink() . '" title="' . sprintf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ) . '" rel="bookmark"',
 						number_format_i18n( $total_images )
@@ -63,4 +63,4 @@
 		<span class="comments-link"><?php comments_popup_link( __( 'Leave a reply', 'twentyeleven' ), __( '1 reply', 'twentyeleven' ), __( '% replies', 'twentyeleven' ) ); ?></span>
 		<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
 	</footer><!-- #entry-meta -->
-</article><!-- #post-<?php the_ID(); ?> -->
+</article><!-- #post-<?php the_ID(); ?> -->
\ No newline at end of file
Index: wp-content/themes/twentyeleven/content-intro.php
===================================================================
--- wp-content/themes/twentyeleven/content-intro.php	(revision 17669)
+++ wp-content/themes/twentyeleven/content-intro.php	(working copy)
@@ -15,4 +15,4 @@
 		<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyeleven' ), 'after' => '</div>' ) ); ?>
 		<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
 	</div><!-- .entry-content -->
-</article><!-- #post-<?php the_ID(); ?> -->
+</article><!-- #post-<?php the_ID(); ?> -->
\ No newline at end of file
Index: wp-content/themes/twentyeleven/content-link.php
===================================================================
--- wp-content/themes/twentyeleven/content-link.php	(revision 17669)
+++ wp-content/themes/twentyeleven/content-link.php	(working copy)
@@ -11,7 +11,7 @@
 
 			<?php if ( 'post' == $post->post_type ) : ?>
 			<?php endif; ?>
-			
+
 			<?php if ( comments_open() ) : ?>
 			<div class="comments-link">
 				<?php comments_popup_link( __( '<span class="leave-reply">Reply</span>', 'twentyeleven' ), __( '1', 'twentyeleven' ), __( '%', 'twentyeleven' ) ); ?>
@@ -47,4 +47,4 @@
 			<?php endif; ?>
 			<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
 		</footer><!-- #entry-meta -->
-	</article><!-- #post-<?php the_ID(); ?> -->
+	</article><!-- #post-<?php the_ID(); ?> -->
\ No newline at end of file
Index: wp-content/themes/twentyeleven/content-page.php
===================================================================
--- wp-content/themes/twentyeleven/content-page.php	(revision 17669)
+++ wp-content/themes/twentyeleven/content-page.php	(working copy)
@@ -15,4 +15,4 @@
 		<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyeleven' ), 'after' => '</div>' ) ); ?>
 		<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
 	</div><!-- .entry-content -->
-</article><!-- #post-<?php the_ID(); ?> -->
+</article><!-- #post-<?php the_ID(); ?> -->
\ No newline at end of file
Index: wp-content/themes/twentyeleven/content-single.php
===================================================================
--- wp-content/themes/twentyeleven/content-single.php	(revision 17669)
+++ wp-content/themes/twentyeleven/content-single.php	(working copy)
@@ -28,7 +28,7 @@
 		<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( '<span>Pages:</span>', 'twentyeleven' ), 'after' => '</div>' ) ); ?>
 	</div><!-- .entry-content -->
 
-	<footer class="entry-meta">		
+	<footer class="entry-meta">
 		<?php
 			$tag_list = get_the_tag_list( '', ', ' );
 			if ( '' != $tag_list ) {
@@ -47,7 +47,7 @@
 			);
 		?>
 		<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
-		
+
 		<?php if ( get_the_author_meta( 'description' ) ) : // If a user has filled out their description, show a bio on their entries ?>
 		<div id="author-info">
 			<div id="author-avatar">
@@ -65,4 +65,4 @@
 		</div><!-- #entry-author-info -->
 		<?php endif; ?>
 	</footer><!-- .entry-meta -->
-</article><!-- #post-<?php the_ID(); ?> -->
+</article><!-- #post-<?php the_ID(); ?> -->
\ No newline at end of file
Index: wp-content/themes/twentyeleven/content.php
===================================================================
--- wp-content/themes/twentyeleven/content.php	(revision 17669)
+++ wp-content/themes/twentyeleven/content.php	(working copy)
@@ -23,7 +23,7 @@
 				?>
 			</div><!-- .entry-meta -->
 			<?php endif; ?>
-			
+
 			<?php if ( comments_open() ) : ?>
 			<div class="comments-link">
 				<?php comments_popup_link( __( '<span class="leave-reply">Reply</span>', 'twentyeleven' ), __( '1', 'twentyeleven' ), __( '%', 'twentyeleven' ) ); ?>
@@ -47,12 +47,12 @@
 			<span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyeleven' ); ?></span><?php the_category( ', ' ); ?></span>
 			<?php the_tags( '<span class="sep"> | </span><span class="tag-links">' . __( 'Tagged ', 'twentyeleven' ) . '</span>', ', ', '' ); ?>
 			<?php endif; ?>
-			
+
 			<?php if ( comments_open() ) : ?>
 			<span class="sep"> | </span>
 			<span class="comments-link"><?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
 			<?php endif; ?>
-			
+
 			<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
 		</footer><!-- #entry-meta -->
-	</article><!-- #post-<?php the_ID(); ?> -->
+	</article><!-- #post-<?php the_ID(); ?> -->
\ No newline at end of file
Index: wp-content/themes/twentyeleven/footer.php
===================================================================
--- wp-content/themes/twentyeleven/footer.php	(revision 17669)
+++ wp-content/themes/twentyeleven/footer.php	(working copy)
@@ -8,29 +8,29 @@
 	</div><!-- #main -->
 
 	<footer id="colophon" role="contentinfo">
-		
+
 			<?php if ( is_active_sidebar( 'sidebar-3' ) || is_active_sidebar( 'sidebar-4' ) || is_active_sidebar( 'sidebar-5' ) ) : ?>
 			<div id="supplementary" <?php twentyeleven_footer_sidebar_class(); ?>>
 				<?php if ( is_active_sidebar( 'sidebar-3' ) ) : ?>
 				<div id="first" class="widget-area" role="complementary">
 					<?php dynamic_sidebar( 'sidebar-3' ); ?>
 				</div><!-- #first .widget-area -->
-				<?php endif; ?>				
+				<?php endif; ?>
 
 				<?php if ( is_active_sidebar( 'sidebar-4' ) ) : ?>
 				<div id="second" class="widget-area" role="complementary">
 					<?php dynamic_sidebar( 'sidebar-4' ); ?>
 				</div><!-- #second .widget-area -->
-				<?php endif; ?>				
+				<?php endif; ?>
 
 				<?php if ( is_active_sidebar( 'sidebar-5' ) ) : ?>
 				<div id="third" class="widget-area" role="complementary">
 					<?php dynamic_sidebar( 'sidebar-5' ); ?>
 				</div><!-- #third .widget-area -->
-				<?php endif; ?>				
+				<?php endif; ?>
 			</div><!-- #supplementary -->
 			<?php endif; ?>
-		
+
 			<div id="site-generator">
 				<a href="http://wordpress.org/" rel="generator">Proudly powered by WordPress</a><span class="sep"> | </span><?php printf( __( 'Theme: %1$s.', 'twentyeleven' ), 'Twenty Eleven' ); ?>
 			</div>
Index: wp-content/themes/twentyeleven/functions.php
===================================================================
--- wp-content/themes/twentyeleven/functions.php	(revision 17669)
+++ wp-content/themes/twentyeleven/functions.php	(working copy)
@@ -285,7 +285,7 @@
 		'before_title' => '<h1 class="widget-title">',
 		'after_title' => '</h1>',
 	) );
-	
+
 	register_sidebar( array(
 		'name' => __( 'Footer Area Two', 'twentyeleven' ),
 		'id' => 'sidebar-4',
@@ -295,7 +295,7 @@
 		'before_title' => '<h1 class="widget-title">',
 		'after_title' => '</h1>',
 	) );
-	
+
 	register_sidebar( array(
 		'name' => __( 'Footer Area Three', 'twentyeleven' ),
 		'id' => 'sidebar-5',
@@ -305,7 +305,7 @@
 		'before_title' => '<h1 class="widget-title">',
 		'after_title' => '</h1>',
 	) );
-	
+
 }
 add_action( 'init', 'twentyeleven_widgets_init' );
 
@@ -355,7 +355,7 @@
  */
 function twentyeleven_footer_sidebar_class() {
 	$count = 0;
-	
+
 	if ( is_active_sidebar( 'sidebar-3' ) )
 		$count++;
 
@@ -364,7 +364,7 @@
 
 	if ( is_active_sidebar( 'sidebar-5' ) )
 		$count++;
-		
+
 	switch ( $count ) {
 		case '1':
 			$class = 'one';
@@ -377,12 +377,12 @@
 		case '3':
 			$class = 'three';
 			break;
-		
+
 		default:
 			$class = '';
 			break;
 	}
-	
+
 	if ( '' != $class )
 		echo 'class="' . $class . '"';
 }
@@ -411,19 +411,19 @@
 						$avatar_size = 68;
 						if ( '0' != $comment->comment_parent )
 							$avatar_size = 39;
-							
+
 						echo get_avatar( $comment, $avatar_size );
-					
+
 						printf( __( '%1$s on %2$s%3$s at %4$s%5$s <span class="says">said:</span>', 'twentyeleven' ),
 							sprintf( '<cite class="fn">%s</cite>', get_comment_author_link() ),
 							'<a href="' . esc_url( get_comment_link( $comment->comment_ID ) ) . '"><time pubdate datetime="' . get_comment_time( 'c' ) . '">',
 							get_comment_date(),
 							get_comment_time(),
-							'</time></a>'							
+							'</time></a>'
 						);
 					?>
-					
-					<?php edit_comment_link( __( '[Edit]', 'twentyeleven' ), ' ' ); ?>					
+
+					<?php edit_comment_link( __( '[Edit]', 'twentyeleven' ), ' ' ); ?>
 				</div><!-- .comment-author .vcard -->
 
 				<?php if ( $comment->comment_approved == '0' ) : ?>
Index: wp-content/themes/twentyeleven/header.php
===================================================================
--- wp-content/themes/twentyeleven/header.php	(revision 17669)
+++ wp-content/themes/twentyeleven/header.php	(working copy)
@@ -52,7 +52,7 @@
 				<h1 id="site-title"><span><a href="<?php echo home_url( '/' ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></span></h1>
 				<h2 id="site-description"><?php bloginfo( 'description' ); ?></h2>
 			</hgroup>
-			
+
 			<?php
 				// Check to see if the header image has been removed
 				if ( get_header_image() != '' ) :
Index: wp-content/themes/twentyeleven/image.php
===================================================================
--- wp-content/themes/twentyeleven/image.php	(revision 17669)
+++ wp-content/themes/twentyeleven/image.php	(working copy)
@@ -10,11 +10,11 @@
 			<div id="content" role="main">
 
 			<?php the_post(); ?>
-			
+
 			<nav id="nav-single">
 				<span class="nav-previous"><?php previous_image_link( false, __( '&larr; Previous' , 'twentyeleven' ) ); ?></span>
 				<span class="nav-next"><?php next_image_link( false, __( 'Next &rarr;' , 'twentyeleven' ) ); ?></span>
-			</nav><!-- #nav-single -->			
+			</nav><!-- #nav-single -->
 
 				<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 					<header class="entry-header">
@@ -70,12 +70,12 @@
 								$attachment_size = apply_filters( 'theme_attachment_size', 848 );
 								echo wp_get_attachment_image( $post->ID, array( $attachment_size, 1024 ) ); // filterable image width with 1024px limit for image height.
 								?></a>
-								
+
 								<?php if ( ! empty( $post->post_excerpt ) ) : ?>
 								<div class="entry-caption">
 									<?php the_excerpt(); ?>
 								</div>
-								<?php endif; ?>								
+								<?php endif; ?>
 							</div><!-- .attachment -->
 
 						</div><!-- .entry-attachment -->
Index: wp-content/themes/twentyeleven/index.php
===================================================================
--- wp-content/themes/twentyeleven/index.php	(revision 17669)
+++ wp-content/themes/twentyeleven/index.php	(working copy)
@@ -1,27 +1,27 @@
-<?php
-/**
- * @package WordPress
- * @subpackage Twenty Eleven
- */
-
-get_header(); ?>
-
-		<div id="primary">
-			<div id="content" role="main">
-
-				<?php twentyeleven_content_nav( 'nav-above' ); ?>
-
-				<?php /* Start the Loop */ ?>
-				<?php while ( have_posts() ) : the_post(); ?>
-
-					<?php get_template_part( 'content', get_post_format() ); ?>
-
-				<?php endwhile; ?>
-
-				<?php twentyeleven_content_nav( 'nav-below' ); ?>
-
-			</div><!-- #content -->
-		</div><!-- #primary -->
-
-<?php get_sidebar(); ?>
+<?php
+/**
+ * @package WordPress
+ * @subpackage Twenty Eleven
+ */
+
+get_header(); ?>
+
+		<div id="primary">
+			<div id="content" role="main">
+
+				<?php twentyeleven_content_nav( 'nav-above' ); ?>
+
+				<?php /* Start the Loop */ ?>
+				<?php while ( have_posts() ) : the_post(); ?>
+
+					<?php get_template_part( 'content', get_post_format() ); ?>
+
+				<?php endwhile; ?>
+
+				<?php twentyeleven_content_nav( 'nav-below' ); ?>
+
+			</div><!-- #content -->
+		</div><!-- #primary -->
+
+<?php get_sidebar(); ?>
 <?php get_footer(); ?>
\ No newline at end of file
Index: wp-content/themes/twentyeleven/page.php
===================================================================
--- wp-content/themes/twentyeleven/page.php	(revision 17669)
+++ wp-content/themes/twentyeleven/page.php	(working copy)
@@ -1,21 +1,21 @@
-<?php
-/**
- * @package WordPress
- * @subpackage Twenty Eleven
- */
-
-get_header(); ?>
-
-		<div id="primary">
-			<div id="content" role="main">
-
-				<?php the_post(); ?>
-
-				<?php get_template_part( 'content', 'page' ); ?>
-
-				<?php comments_template( '', true ); ?>
-
-			</div><!-- #content -->
-		</div><!-- #primary -->
-
+<?php
+/**
+ * @package WordPress
+ * @subpackage Twenty Eleven
+ */
+
+get_header(); ?>
+
+		<div id="primary">
+			<div id="content" role="main">
+
+				<?php the_post(); ?>
+
+				<?php get_template_part( 'content', 'page' ); ?>
+
+				<?php comments_template( '', true ); ?>
+
+			</div><!-- #content -->
+		</div><!-- #primary -->
+
 <?php get_footer(); ?>
\ No newline at end of file
Index: wp-content/themes/twentyeleven/search.php
===================================================================
--- wp-content/themes/twentyeleven/search.php	(revision 17669)
+++ wp-content/themes/twentyeleven/search.php	(working copy)
@@ -1,48 +1,48 @@
-<?php
-/**
- * @package WordPress
- * @subpackage Twenty Eleven
- */
-
-get_header(); ?>
-
-		<section id="primary">
-			<div id="content" role="main">
-
-			<?php if ( have_posts() ) : ?>
-
-				<header class="page-header">
-					<h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'twentyeleven' ), '<span>' . get_search_query() . '</span>' ); ?></h1>
-				</header>
-
-				<?php twentyeleven_content_nav( 'nav-above' ); ?>
-
-				<?php /* Start the Loop */ ?>
-				<?php while ( have_posts() ) : the_post(); ?>
-
-					<?php get_template_part( 'content', 'search' ); ?>
-
-				<?php endwhile; ?>
-
-				<?php twentyeleven_content_nav( 'nav-below' ); ?>
-
-			<?php else : ?>
-
-				<article id="post-0" class="post no-results not-found">
-					<header class="entry-header">
-						<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentyeleven' ); ?></h1>
-					</header><!-- .entry-header -->
-
-					<div class="entry-content">
-						<p><?php _e( 'Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'twentyeleven' ); ?></p>
-						<?php get_search_form(); ?>
-					</div><!-- .entry-content -->
-				</article><!-- #post-0 -->
-
-			<?php endif; ?>
-
-			</div><!-- #content -->
-		</section><!-- #primary -->
-
-<?php get_sidebar(); ?>
+<?php
+/**
+ * @package WordPress
+ * @subpackage Twenty Eleven
+ */
+
+get_header(); ?>
+
+		<section id="primary">
+			<div id="content" role="main">
+
+			<?php if ( have_posts() ) : ?>
+
+				<header class="page-header">
+					<h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'twentyeleven' ), '<span>' . get_search_query() . '</span>' ); ?></h1>
+				</header>
+
+				<?php twentyeleven_content_nav( 'nav-above' ); ?>
+
+				<?php /* Start the Loop */ ?>
+				<?php while ( have_posts() ) : the_post(); ?>
+
+					<?php get_template_part( 'content', 'search' ); ?>
+
+				<?php endwhile; ?>
+
+				<?php twentyeleven_content_nav( 'nav-below' ); ?>
+
+			<?php else : ?>
+
+				<article id="post-0" class="post no-results not-found">
+					<header class="entry-header">
+						<h1 class="entry-title"><?php _e( 'Nothing Found', 'twentyeleven' ); ?></h1>
+					</header><!-- .entry-header -->
+
+					<div class="entry-content">
+						<p><?php _e( 'Sorry, but nothing matched your search criteria. Please try again with some different keywords.', 'twentyeleven' ); ?></p>
+						<?php get_search_form(); ?>
+					</div><!-- .entry-content -->
+				</article><!-- #post-0 -->
+
+			<?php endif; ?>
+
+			</div><!-- #content -->
+		</section><!-- #primary -->
+
+<?php get_sidebar(); ?>
 <?php get_footer(); ?>
\ No newline at end of file
Index: wp-content/themes/twentyeleven/searchform.php
===================================================================
--- wp-content/themes/twentyeleven/searchform.php	(revision 17669)
+++ wp-content/themes/twentyeleven/searchform.php	(working copy)
@@ -1,10 +1,10 @@
-<?php
-/**
- * @package WordPress
- * @subpackage Twenty Eleven
- */
-?>
-	<form method="get" id="searchform" action="<?php echo home_url( '/' ); ?>">
-		<input type="text" class="field" name="s" id="s" placeholder="<?php esc_attr_e( 'Search', 'twentyeleven' ); ?>" />
-		<input type="submit" class="submit" name="submit" id="searchsubmit" value="<?php esc_attr_e( 'Search', 'twentyeleven' ); ?>" />
-	</form>
+<?php
+/**
+ * @package WordPress
+ * @subpackage Twenty Eleven
+ */
+?>
+	<form method="get" id="searchform" action="<?php echo home_url( '/' ); ?>">
+		<input type="text" class="field" name="s" id="s" placeholder="<?php esc_attr_e( 'Search', 'twentyeleven' ); ?>" />
+		<input type="submit" class="submit" name="submit" id="searchsubmit" value="<?php esc_attr_e( 'Search', 'twentyeleven' ); ?>" />
+	</form>
\ No newline at end of file
Index: wp-content/themes/twentyeleven/showcase.php
===================================================================
--- wp-content/themes/twentyeleven/showcase.php	(revision 17669)
+++ wp-content/themes/twentyeleven/showcase.php	(working copy)
@@ -1,138 +1,138 @@
-<?php
-/**
- * Template Name: Showcase Template
- * Description: A Page Template that showcases Sticky Posts, Asides, and Blog Posts
- *
- * @package WordPress
- * @subpackage Twenty Eleven
- */
-
-get_header(); ?>
-
-		<div id="primary" class="showcase">
-			<div id="content" role="main">
-				
-				<?php the_post(); ?>
-							
-				<?php
-					// If we have content for this page, let's display it.
-					if ( '' != get_the_content() )
-						get_template_part( 'content', 'intro' );
-				?>
-				
-				<?php
-					// See if we have any sticky posts and use the latest to create a featured post
-					$sticky = get_option( 'sticky_posts' );
-					$featured_args = array(
-						'posts_per_page' => 1,
-						'post__in' => $sticky,
-					);
-					
-					$featured = new WP_Query();
-					$featured->query( $featured_args );
-				
-					// Let's roll.
-					if ( $sticky ) :
-					
-					$featured->the_post();
-					
-					// We're going to add a class to our featured post for featured images
-					// by default it'll have no class though
-					$feature_class = '';
-
-					if ( has_post_thumbnail() ) {
-						// … but if it has a featured image let's add some class
-						$feature_class = 'feature-image small';
-
-						// Hang on. Let's check this here image out.
-						$image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), array( HEADER_IMAGE_WIDTH, HEADER_IMAGE_WIDTH ) );
-
-						// Is it bigger than or equal to our header?
-						if ( $image[1] >= HEADER_IMAGE_WIDTH ) {
-							// Let's add a BIGGER class. It's EXTRA classy now.
-							$feature_class = 'feature-image large';
-						}
-					}
-					?>
-				
-				<?php if ( has_post_thumbnail() ) : ?>
-				<section class="featured-post <?php echo $feature_class; ?>">
-				<?php else : ?>
-				<section class="featured-post">
-				<?php endif; ?>
-					<h1 class="showcase-heading"><?php _e( 'Featured Post', 'twentyeleven' ); ?></h1>
-					<?php
-						// Dynamic thumbnails!
-						if ( has_post_thumbnail() ) {
-							if ( $image[1] >= HEADER_IMAGE_WIDTH ) { ?>
-								<a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"> <?php the_post_thumbnail( 'large-feature' ); ?></a>
-							<?php } else { ?>
-								<a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_post_thumbnail( 'small-feature' ); ?></a>
-							<?php }
-						}					
-					?>					
-					<?php get_template_part( 'content', 'featured' ); ?>
-				</section>							
-				<?php endif; ?>
-
-				<section class="recent-posts">
-					<h1 class="showcase-heading"><?php _e( 'Recent Posts', 'twentyeleven' ); ?></h1>
-					
-					<?php
-
-					// Display our recent posts, showing full content for the very latest, ignoring Aside posts
-					$recent_args = array(
-						'order' => 'DESC',
-						'post__not_in' => get_option( 'sticky_posts' ),
-						'tax_query' => array(
-							array(
-								'taxonomy' => 'post_format',
-								'terms' => array( 'post-format-aside', 'post-format-link' ),
-								'field' => 'slug',
-								'operator' => 'NOT IN',
-							),
-						),
-					);
-					$recent = new WP_Query();
-					$recent->query( $recent_args );
-					$counter = 0;
-					
-					while ( $recent->have_posts() ) : $recent->the_post();
-						// set $more to 0 in order to only get the first part of the post
-						global $more;
-						$more = 0;					
-						$counter++;
-						
-						if ( 1 == $counter ) :
-							get_template_part( 'content', get_post_format() );
-							echo '<ol class="other-recent-posts">';
-							
-						else : ?>
-							<li class="entry-title">
-								<a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a>
-								<span class="comments-link">
-									<?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?>
-								</span>
-							</li>
-							
-						<?php endif;
-					endwhile;
-					?>
-					
-					</ol>
-				</section>
-				
-				<div class="widget-area" role="complementary">
-					<?php if ( ! dynamic_sidebar( 'sidebar-2' ) ) : ?>
-						
-						<?php
-						the_widget( 'Twenty_Eleven_Ephemera_Widget', '', 'before_title=<h1 class="widget-title">&after_title=</h1>' );
-						?>						
-
-					<?php endif; // end sidebar widget area ?>
-				</div><!-- .widget-area -->
-
-			</div><!-- #content -->
-		</div><!-- #primary -->
-
+<?php
+/**
+ * Template Name: Showcase Template
+ * Description: A Page Template that showcases Sticky Posts, Asides, and Blog Posts
+ *
+ * @package WordPress
+ * @subpackage Twenty Eleven
+ */
+
+get_header(); ?>
+
+		<div id="primary" class="showcase">
+			<div id="content" role="main">
+
+				<?php the_post(); ?>
+
+				<?php
+					// If we have content for this page, let's display it.
+					if ( '' != get_the_content() )
+						get_template_part( 'content', 'intro' );
+				?>
+
+				<?php
+					// See if we have any sticky posts and use the latest to create a featured post
+					$sticky = get_option( 'sticky_posts' );
+					$featured_args = array(
+						'posts_per_page' => 1,
+						'post__in' => $sticky,
+					);
+
+					$featured = new WP_Query();
+					$featured->query( $featured_args );
+
+					// Let's roll.
+					if ( $sticky ) :
+
+					$featured->the_post();
+
+					// We're going to add a class to our featured post for featured images
+					// by default it'll have no class though
+					$feature_class = '';
+
+					if ( has_post_thumbnail() ) {
+						// … but if it has a featured image let's add some class
+						$feature_class = 'feature-image small';
+
+						// Hang on. Let's check this here image out.
+						$image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), array( HEADER_IMAGE_WIDTH, HEADER_IMAGE_WIDTH ) );
+
+						// Is it bigger than or equal to our header?
+						if ( $image[1] >= HEADER_IMAGE_WIDTH ) {
+							// Let's add a BIGGER class. It's EXTRA classy now.
+							$feature_class = 'feature-image large';
+						}
+					}
+					?>
+
+				<?php if ( has_post_thumbnail() ) : ?>
+				<section class="featured-post <?php echo $feature_class; ?>">
+				<?php else : ?>
+				<section class="featured-post">
+				<?php endif; ?>
+					<h1 class="showcase-heading"><?php _e( 'Featured Post', 'twentyeleven' ); ?></h1>
+					<?php
+						// Dynamic thumbnails!
+						if ( has_post_thumbnail() ) {
+							if ( $image[1] >= HEADER_IMAGE_WIDTH ) { ?>
+								<a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"> <?php the_post_thumbnail( 'large-feature' ); ?></a>
+							<?php } else { ?>
+								<a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_post_thumbnail( 'small-feature' ); ?></a>
+							<?php }
+						}
+					?>
+					<?php get_template_part( 'content', 'featured' ); ?>
+				</section>
+				<?php endif; ?>
+
+				<section class="recent-posts">
+					<h1 class="showcase-heading"><?php _e( 'Recent Posts', 'twentyeleven' ); ?></h1>
+
+					<?php
+
+					// Display our recent posts, showing full content for the very latest, ignoring Aside posts
+					$recent_args = array(
+						'order' => 'DESC',
+						'post__not_in' => get_option( 'sticky_posts' ),
+						'tax_query' => array(
+							array(
+								'taxonomy' => 'post_format',
+								'terms' => array( 'post-format-aside', 'post-format-link' ),
+								'field' => 'slug',
+								'operator' => 'NOT IN',
+							),
+						),
+					);
+					$recent = new WP_Query();
+					$recent->query( $recent_args );
+					$counter = 0;
+
+					while ( $recent->have_posts() ) : $recent->the_post();
+						// set $more to 0 in order to only get the first part of the post
+						global $more;
+						$more = 0;
+						$counter++;
+
+						if ( 1 == $counter ) :
+							get_template_part( 'content', get_post_format() );
+							echo '<ol class="other-recent-posts">';
+
+						else : ?>
+							<li class="entry-title">
+								<a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a>
+								<span class="comments-link">
+									<?php comments_popup_link( __( '<span class="leave-reply">Leave a reply</span>', 'twentyeleven' ), __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?>
+								</span>
+							</li>
+
+						<?php endif;
+					endwhile;
+					?>
+
+					</ol>
+				</section>
+
+				<div class="widget-area" role="complementary">
+					<?php if ( ! dynamic_sidebar( 'sidebar-2' ) ) : ?>
+
+						<?php
+						the_widget( 'Twenty_Eleven_Ephemera_Widget', '', 'before_title=<h1 class="widget-title">&after_title=</h1>' );
+						?>
+
+					<?php endif; // end sidebar widget area ?>
+				</div><!-- .widget-area -->
+
+			</div><!-- #content -->
+		</div><!-- #primary -->
+
 <?php get_footer(); ?>
\ No newline at end of file
Index: wp-content/themes/twentyeleven/sidebar.php
===================================================================
--- wp-content/themes/twentyeleven/sidebar.php	(revision 17669)
+++ wp-content/themes/twentyeleven/sidebar.php	(working copy)
@@ -1,28 +1,27 @@
-<?php
-/**
- * @package WordPress
- * @subpackage Twenty Eleven
- */
-?>
-		<div id="secondary" class="widget-area" role="complementary">
-			<?php if ( ! dynamic_sidebar( 'sidebar-1' ) ) : ?>
-
-				<aside id="archives" class="widget">
-					<h1 class="widget-title"><?php _e( 'Archives', 'twentyeleven' ); ?></h1>
-					<ul>
-						<?php wp_get_archives( array( 'type' => 'monthly' ) ); ?>
-					</ul>
-				</aside>
-
-				<aside id="meta" class="widget">
-					<h1 class="widget-title"><?php _e( 'Meta', 'twentyeleven' ); ?></h1>
-					<ul>
-						<?php wp_register(); ?>
-						<li><?php wp_loginout(); ?></li>
-						<?php wp_meta(); ?>
-					</ul>
-				</aside>
-
-			<?php endif; // end sidebar widget area ?>
-		</div><!-- #secondary .widget-area -->
-		
\ No newline at end of file
+<?php
+/**
+ * @package WordPress
+ * @subpackage Twenty Eleven
+ */
+?>
+		<div id="secondary" class="widget-area" role="complementary">
+			<?php if ( ! dynamic_sidebar( 'sidebar-1' ) ) : ?>
+
+				<aside id="archives" class="widget">
+					<h1 class="widget-title"><?php _e( 'Archives', 'twentyeleven' ); ?></h1>
+					<ul>
+						<?php wp_get_archives( array( 'type' => 'monthly' ) ); ?>
+					</ul>
+				</aside>
+
+				<aside id="meta" class="widget">
+					<h1 class="widget-title"><?php _e( 'Meta', 'twentyeleven' ); ?></h1>
+					<ul>
+						<?php wp_register(); ?>
+						<li><?php wp_loginout(); ?></li>
+						<?php wp_meta(); ?>
+					</ul>
+				</aside>
+
+			<?php endif; // end sidebar widget area ?>
+		</div><!-- #secondary .widget-area -->
Index: wp-content/themes/twentyeleven/single.php
===================================================================
--- wp-content/themes/twentyeleven/single.php	(revision 17669)
+++ wp-content/themes/twentyeleven/single.php	(working copy)
@@ -1,31 +1,31 @@
-<?php
-/**
- * @package WordPress
- * @subpackage Twenty Eleven
- */
-
-get_header(); ?>
-
-		<div id="primary">
-			<div id="content" role="main">
-
-				<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
-
-					<nav id="nav-single">
-						<h1 class="section-heading"><?php _e( 'Post navigation', 'toolbox' ); ?></h1>
-						<span class="nav-previous"><?php previous_post_link( '%link', __( '&larr; Previous', 'twentyeleven' ) ); ?></span>
-						<span class="nav-next"><?php next_post_link( '%link', __( 'Next &rarr;', 'twentyeleven' ) ); ?></span>
-					</nav><!-- #nav-single -->
-
-					<?php get_template_part( 'content', 'single' ); ?>
-
-					<?php twentyeleven_content_nav( 'nav-below' ); ?>
-
-					<?php comments_template( '', true ); ?>
-
-				<?php endwhile; // end of the loop. ?>
-
-			</div><!-- #content -->
-		</div><!-- #primary -->
-
+<?php
+/**
+ * @package WordPress
+ * @subpackage Twenty Eleven
+ */
+
+get_header(); ?>
+
+		<div id="primary">
+			<div id="content" role="main">
+
+				<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
+
+					<nav id="nav-single">
+						<h1 class="section-heading"><?php _e( 'Post navigation', 'toolbox' ); ?></h1>
+						<span class="nav-previous"><?php previous_post_link( '%link', __( '&larr; Previous', 'twentyeleven' ) ); ?></span>
+						<span class="nav-next"><?php next_post_link( '%link', __( 'Next &rarr;', 'twentyeleven' ) ); ?></span>
+					</nav><!-- #nav-single -->
+
+					<?php get_template_part( 'content', 'single' ); ?>
+
+					<?php twentyeleven_content_nav( 'nav-below' ); ?>
+
+					<?php comments_template( '', true ); ?>
+
+				<?php endwhile; // end of the loop. ?>
+
+			</div><!-- #content -->
+		</div><!-- #primary -->
+
 <?php get_footer(); ?>
\ No newline at end of file
Index: wp-content/themes/twentyeleven/tag.php
===================================================================
--- wp-content/themes/twentyeleven/tag.php	(revision 17669)
+++ wp-content/themes/twentyeleven/tag.php	(working copy)
@@ -1,39 +1,39 @@
-<?php
-/**
- * The template used to display Tag Archive pages
- *
- * @package WordPress
- * @subpackage Twenty Eleven
- */
-
-get_header(); ?>
-
-		<section id="primary">
-			<div id="content" role="main">
-
-				<?php the_post(); ?>
-
-				<header class="page-header">
-					<h1 class="page-title"><?php
-						printf( __( 'Tag Archives: %s', 'twentyeleven' ), '<span>' . single_tag_title( '', false ) . '</span>' );
-					?></h1>
-				</header>
-
-				<?php rewind_posts(); ?>
-
-				<?php twentyeleven_content_nav( 'nav-above' ); ?>
-
-				<?php /* Start the Loop */ ?>
-				<?php while ( have_posts() ) : the_post(); ?>
-
-					<?php get_template_part( 'content', get_post_format() ); ?>
-
-				<?php endwhile; ?>
-
-				<?php twentyeleven_content_nav( 'nav-below' ); ?>
-
-			</div><!-- #content -->
-		</section><!-- #primary -->
-
-<?php get_sidebar(); ?>
+<?php
+/**
+ * The template used to display Tag Archive pages
+ *
+ * @package WordPress
+ * @subpackage Twenty Eleven
+ */
+
+get_header(); ?>
+
+		<section id="primary">
+			<div id="content" role="main">
+
+				<?php the_post(); ?>
+
+				<header class="page-header">
+					<h1 class="page-title"><?php
+						printf( __( 'Tag Archives: %s', 'twentyeleven' ), '<span>' . single_tag_title( '', false ) . '</span>' );
+					?></h1>
+				</header>
+
+				<?php rewind_posts(); ?>
+
+				<?php twentyeleven_content_nav( 'nav-above' ); ?>
+
+				<?php /* Start the Loop */ ?>
+				<?php while ( have_posts() ) : the_post(); ?>
+
+					<?php get_template_part( 'content', get_post_format() ); ?>
+
+				<?php endwhile; ?>
+
+				<?php twentyeleven_content_nav( 'nav-below' ); ?>
+
+			</div><!-- #content -->
+		</section><!-- #primary -->
+
+<?php get_sidebar(); ?>
 <?php get_footer(); ?>
\ No newline at end of file
Index: wp-content/themes/twentyeleven/widgets.php
===================================================================
--- wp-content/themes/twentyeleven/widgets.php	(revision 17669)
+++ wp-content/themes/twentyeleven/widgets.php	(working copy)
@@ -1,167 +1,167 @@
-<?php
-/**
- * new WordPress Widget format
- * Wordpress 2.8 and above
- * @see http://codex.wordpress.org/Widgets_API#Developing_Widgets
- */
-class Twenty_Eleven_Ephemera_Widget extends WP_Widget {
-	
-	/**
-	 * Constructor
-	 *
-	 * @return void
-	 **/
-	function Twenty_Eleven_Ephemera_Widget() {
-		$widget_ops = array( 'classname' => 'widget_twentyeleven_ephemera', 'description' => __( 'Use this widget to list your recent Aside and Link posts', 'twentyeleven' ) );
-		$this->WP_Widget( 'widget_twentyeleven_ephemera', __( 'Twenty Eleven Ephemera', 'twentyeleven' ), $widget_ops );
-		$this->alt_option_name = 'widget_twentyeleven_ephemera';
-		
-		add_action( 'save_post', array(&$this, 'flush_widget_cache' ) );
-		add_action( 'deleted_post', array(&$this, 'flush_widget_cache' ) );
-		add_action( 'switch_theme', array(&$this, 'flush_widget_cache' ) );
-		
-	}
-
-	/**
-	 * Outputs the HTML for this widget.
-	 *
-	 * @param array An array of standard parameters for widgets in this theme 
-	 * @param array An array of settings for this widget instance 
-	 * @return void Echoes it's output
-	 **/
-	function widget( $args, $instance ) {
-		$cache = wp_cache_get( 'widget_twentyeleven_ephemera', 'widget' );
-
-		if ( !is_array($cache) )
-			$cache = array();
-
-		if ( ! isset( $args['widget_id'] ) )
-			$args['widget_id'] = null;
-
-		if ( isset($cache[$args['widget_id']]) ) {
-			echo $cache[$args['widget_id']];
-			return;
-		}
-
-		ob_start();		
-		extract( $args, EXTR_SKIP );
-		
-		$title = apply_filters( 'widget_title', empty($instance['title']) ? __( 'Ephemera' ) : $instance['title'], $instance, $this->id_base);
-		
-		if ( ! isset( $instance['number'] ) )
-			$instance['number'] = '10';
-			
-		if ( ! $number = absint( $instance['number'] ) )
- 			$number = 10;
-
-		$ephemera_args = array(
-			'order' => 'DESC',
-			'posts_per_page' => $number,
-			'nopaging' => 0,
-			'post_status' => 'publish',
-			'post__not_in' => get_option( 'sticky_posts' ),
-			'tax_query' => array(
-				array(
-					'taxonomy' => 'post_format',
-					'terms' => array( 'post-format-aside', 'post-format-link' ),
-					'field' => 'slug',
-					'operator' => 'IN',
-				),
-			),
-		);
-		$ephemera = new WP_Query();
-		$ephemera->query( $ephemera_args );
-
-		if ( $ephemera->have_posts() ) :
-		
-		echo $before_widget;
-		echo $before_title;
-		echo $title; // Can set this with a widget option, or omit altogether
-		echo $after_title;
-
-		global $post;
-		
-		?>
-		<ol>
-		<?php while ( $ephemera->have_posts() ) : $ephemera->the_post(); ?>
-			
-			<?php if ( 'aside' == get_post_format( $post->ID ) ) : ?>
-				
-			<li class="entry-title">
-				<a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a>
-				<span class="comments-link">
-					<?php comments_popup_link( __( '0 <span class="reply">comments &rarr;</span>', 'twentyeleven' ), __( '1 <span class="reply">comment &rarr;</span>', 'twentyeleven' ), __( '% <span class="reply">comments &rarr;</span>', 'twentyeleven' ) ); ?>
-				</span>
-			</li>
-			
-			<?php elseif ( 'link' == get_post_format( $post->ID ) ) : ?>
-
-			<li class="entry-title">
-				<?php
-					$link_url = get_permalink();
-					
-					if ( false != twentyeleven_url_grabber() )
-						$link_url = twentyeleven_url_grabber();
-				?>
-				<a href="<?php echo $link_url; ?>" title="<?php printf( esc_attr__( 'Link to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?>&nbsp;<span>&rarr;</span></a>
-				<span class="comments-link">
-					<?php comments_popup_link( __( '0 <span class="reply">comments &rarr;</span>', 'twentyeleven' ), __( '1 <span class="reply">comment &rarr;</span>', 'twentyeleven' ), __( '% <span class="reply">comments &rarr;</span>', 'twentyeleven' ) ); ?>
-				</span>
-			</li>
-			
-			<?php endif; ?>
-			
-		<?php endwhile; ?>
-		</ol>
-		<?php
-
-		echo $after_widget;
-		
-		// Reset the global $the_post as this query will have stomped on it
-		wp_reset_postdata();
-
-		// end check for ephemeral posts
-		endif;
-
-		$cache[$args['widget_id']] = ob_get_flush();
-		wp_cache_set( 'widget_twentyeleven_ephemera', $cache, 'widget' );
-	}
-
-	/**
-	 * Deals with the settings when they are saved by the admin. Here is
-	 * where any validation should be dealt with.
-	 **/
-	function update( $new_instance, $old_instance ) {
-		$instance = $old_instance;
-		$instance['title'] = strip_tags($new_instance['title']);
-		$instance['number'] = (int) $new_instance['number'];
-		$this->flush_widget_cache();
-
-		$alloptions = wp_cache_get( 'alloptions', 'options' );
-		if ( isset($alloptions['widget_twentyeleven_ephemera']) )
-			delete_option( 'widget_twentyeleven_ephemera' );
-
-		return $instance;
-	}
-	
-	function flush_widget_cache() {
-		wp_cache_delete( 'widget_twentyeleven_ephemera', 'widget' );
-	}	
-
-	/**
-	 * Displays the form for this widget on the Widgets page of the WP Admin area.
-	 **/
-	function form( $instance ) {
-				$title = isset($instance['title']) ? esc_attr($instance['title']) : '';
-				$number = isset($instance['number']) ? absint($instance['number']) : 10;
-		?>
-				<p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:', 'twentyeleven' ); ?></label>
-				<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" /></p>
-
-				<p><label for="<?php echo $this->get_field_id( 'number' ); ?>"><?php _e( 'Number of posts to show:', 'twentyeleven' ); ?></label>
-				<input id="<?php echo $this->get_field_id( 'number' ); ?>" name="<?php echo $this->get_field_name( 'number' ); ?>" type="text" value="<?php echo $number; ?>" size="3" /></p>
-		<?php
-	}
-}
-
+<?php
+/**
+ * new WordPress Widget format
+ * Wordpress 2.8 and above
+ * @see http://codex.wordpress.org/Widgets_API#Developing_Widgets
+ */
+class Twenty_Eleven_Ephemera_Widget extends WP_Widget {
+
+	/**
+	 * Constructor
+	 *
+	 * @return void
+	 **/
+	function Twenty_Eleven_Ephemera_Widget() {
+		$widget_ops = array( 'classname' => 'widget_twentyeleven_ephemera', 'description' => __( 'Use this widget to list your recent Aside and Link posts', 'twentyeleven' ) );
+		$this->WP_Widget( 'widget_twentyeleven_ephemera', __( 'Twenty Eleven Ephemera', 'twentyeleven' ), $widget_ops );
+		$this->alt_option_name = 'widget_twentyeleven_ephemera';
+
+		add_action( 'save_post', array(&$this, 'flush_widget_cache' ) );
+		add_action( 'deleted_post', array(&$this, 'flush_widget_cache' ) );
+		add_action( 'switch_theme', array(&$this, 'flush_widget_cache' ) );
+
+	}
+
+	/**
+	 * Outputs the HTML for this widget.
+	 *
+	 * @param array An array of standard parameters for widgets in this theme
+	 * @param array An array of settings for this widget instance
+	 * @return void Echoes it's output
+	 **/
+	function widget( $args, $instance ) {
+		$cache = wp_cache_get( 'widget_twentyeleven_ephemera', 'widget' );
+
+		if ( !is_array($cache) )
+			$cache = array();
+
+		if ( ! isset( $args['widget_id'] ) )
+			$args['widget_id'] = null;
+
+		if ( isset($cache[$args['widget_id']]) ) {
+			echo $cache[$args['widget_id']];
+			return;
+		}
+
+		ob_start();
+		extract( $args, EXTR_SKIP );
+
+		$title = apply_filters( 'widget_title', empty($instance['title']) ? __( 'Ephemera' ) : $instance['title'], $instance, $this->id_base);
+
+		if ( ! isset( $instance['number'] ) )
+			$instance['number'] = '10';
+
+		if ( ! $number = absint( $instance['number'] ) )
+ 			$number = 10;
+
+		$ephemera_args = array(
+			'order' => 'DESC',
+			'posts_per_page' => $number,
+			'nopaging' => 0,
+			'post_status' => 'publish',
+			'post__not_in' => get_option( 'sticky_posts' ),
+			'tax_query' => array(
+				array(
+					'taxonomy' => 'post_format',
+					'terms' => array( 'post-format-aside', 'post-format-link' ),
+					'field' => 'slug',
+					'operator' => 'IN',
+				),
+			),
+		);
+		$ephemera = new WP_Query();
+		$ephemera->query( $ephemera_args );
+
+		if ( $ephemera->have_posts() ) :
+
+		echo $before_widget;
+		echo $before_title;
+		echo $title; // Can set this with a widget option, or omit altogether
+		echo $after_title;
+
+		global $post;
+
+		?>
+		<ol>
+		<?php while ( $ephemera->have_posts() ) : $ephemera->the_post(); ?>
+
+			<?php if ( 'aside' == get_post_format( $post->ID ) ) : ?>
+
+			<li class="entry-title">
+				<a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a>
+				<span class="comments-link">
+					<?php comments_popup_link( __( '0 <span class="reply">comments &rarr;</span>', 'twentyeleven' ), __( '1 <span class="reply">comment &rarr;</span>', 'twentyeleven' ), __( '% <span class="reply">comments &rarr;</span>', 'twentyeleven' ) ); ?>
+				</span>
+			</li>
+
+			<?php elseif ( 'link' == get_post_format( $post->ID ) ) : ?>
+
+			<li class="entry-title">
+				<?php
+					$link_url = get_permalink();
+
+					if ( false != twentyeleven_url_grabber() )
+						$link_url = twentyeleven_url_grabber();
+				?>
+				<a href="<?php echo $link_url; ?>" title="<?php printf( esc_attr__( 'Link to %s', 'twentyeleven' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?>&nbsp;<span>&rarr;</span></a>
+				<span class="comments-link">
+					<?php comments_popup_link( __( '0 <span class="reply">comments &rarr;</span>', 'twentyeleven' ), __( '1 <span class="reply">comment &rarr;</span>', 'twentyeleven' ), __( '% <span class="reply">comments &rarr;</span>', 'twentyeleven' ) ); ?>
+				</span>
+			</li>
+
+			<?php endif; ?>
+
+		<?php endwhile; ?>
+		</ol>
+		<?php
+
+		echo $after_widget;
+
+		// Reset the global $the_post as this query will have stomped on it
+		wp_reset_postdata();
+
+		// end check for ephemeral posts
+		endif;
+
+		$cache[$args['widget_id']] = ob_get_flush();
+		wp_cache_set( 'widget_twentyeleven_ephemera', $cache, 'widget' );
+	}
+
+	/**
+	 * Deals with the settings when they are saved by the admin. Here is
+	 * where any validation should be dealt with.
+	 **/
+	function update( $new_instance, $old_instance ) {
+		$instance = $old_instance;
+		$instance['title'] = strip_tags($new_instance['title']);
+		$instance['number'] = (int) $new_instance['number'];
+		$this->flush_widget_cache();
+
+		$alloptions = wp_cache_get( 'alloptions', 'options' );
+		if ( isset($alloptions['widget_twentyeleven_ephemera']) )
+			delete_option( 'widget_twentyeleven_ephemera' );
+
+		return $instance;
+	}
+
+	function flush_widget_cache() {
+		wp_cache_delete( 'widget_twentyeleven_ephemera', 'widget' );
+	}
+
+	/**
+	 * Displays the form for this widget on the Widgets page of the WP Admin area.
+	 **/
+	function form( $instance ) {
+				$title = isset($instance['title']) ? esc_attr($instance['title']) : '';
+				$number = isset($instance['number']) ? absint($instance['number']) : 10;
+		?>
+				<p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:', 'twentyeleven' ); ?></label>
+				<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" /></p>
+
+				<p><label for="<?php echo $this->get_field_id( 'number' ); ?>"><?php _e( 'Number of posts to show:', 'twentyeleven' ); ?></label>
+				<input id="<?php echo $this->get_field_id( 'number' ); ?>" name="<?php echo $this->get_field_name( 'number' ); ?>" type="text" value="<?php echo $number; ?>" size="3" /></p>
+		<?php
+	}
+}
+
 add_action( 'widgets_init', create_function( '', "register_widget( 'Twenty_Eleven_Ephemera_Widget' );" ) );
\ No newline at end of file