Remove duplicated blog page

There was both a blog.html in the root and under /blog.
Removed the one in the root and updated the contents
of the other to match the new theme.

blog.html

@@ -1,24 +0,0 @@
----
-layout: default
-permalink: /blog/
----
-
-<div class="home">
-
-  <h1 class="page-heading">Posts</h1>
-
-  <ul class="post-list">
-    {% for post in site.posts %}
-      <li>
-        <span class="post-meta">{{ post.date | date: "%b %-d, %Y" }}</span>
-
-        <h2>
-          <a class="post-link" href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a>
-        </h2>
-      </li>
-    {% endfor %}
-  </ul>
-
-  <p class="rss-subscribe">subscribe <a href="{{ "/feed.xml" | prepend: site.baseurl }}">via RSS</a></p>
-
-</div>

blog/index.html

@@ -1,12 +1,17 @@
 ---
-layout: default
+layout: page
+permalink: /blog/
+title: News
 ---
-<header class="post-header">
+<div id="post-list">
-    <h1 class="post-title">News</h1>
+<ul>
-  </header>
 {% for post in site.posts %}
-		<time>{{ post.date | date: "%b %-d, %Y" }}</time>
+    <li>
-		<h3><a href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a></h3>
+      <span class="post-list-meta">{{ post.date | date: "%b %-d, %Y" }}</span>
+      <span class="post-list-link"><a href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a></span>
+      <span class="post-list-excerpt">{{ post.excerpt }} [<a href="{{ post.url | prepend: site.baseurl }}">...</a>]</span>
+    </li>
 {% endfor %}
-
+</ul>
+</div>
 <p>subscribe <a href="{{ "/feed.xml" | prepend: site.baseurl }}">via RSS</a></p>