move about / contact to top level

_layouts/default.html

@@ -22,9 +22,9 @@
   <nav role="navigation">
     <ul class="navigation">
       <li><a href="/">Home</a></li>
-      <li><a href="/about/">About</a></li>
+      <li><a href="/about.html">About</a></li>
       <li><a href="/blog/">Blog</a></li>
-      <li><a href="/contact/">Contact</a></li>
+      <li><a href="/contact.html">Contact</a></li>
     </ul>
   </nav>
   <section id="main">

htaccess

@@ -3,6 +3,7 @@ layout: nil
 permalink: .htaccess
 ---
 ErrorDocument 404 /404.html
+Options +Multiviews
 
 Redirect permanent /james-walker /about/