Merge pull request #6 from ramsey/master

Syncing up the master branch

Author: ramsey

.htaccess

@@ -1,13 +1,12 @@
-Redirect temp /about /2011/about
-Redirect temp /location /2011/location
-Redirect temp /schedule /2011/schedule
-Redirect temp /speakers /2011/speakers
-Redirect temp /sponsorships /2011/sponsorships
-Redirect temp /subscribe /2011/subscribe
+Redirect temp /about http://phpcon.org/2011/about
+Redirect temp /location http://phpcon.org/2011/location
+Redirect temp /schedule http://phpcon.org/2011/schedule
+Redirect temp /speakers http://phpcon.org/2011/speakers
+Redirect temp /sponsorships http://phpcon.org/2011/sponsorships
+Redirect temp /subscribe http://phpcon.org/2011/subscribe
 
 <IfModule mod_rewrite.c>
     RewriteEngine On
-    #RewriteBase /~ramsey/phpcon-web/
     RewriteRule ^(resources|templates).*$ http://phpcon.org/ [R=302,L]
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteCond %{REQUEST_FILENAME} !-f

resources/home.html

@@ -1,5 +1,5 @@
 <?php
-$title = "Returning March 2013 - ";
+$title = "Returning March 14 & 15, 2013 - ";
 ob_start();
 ?>
         <div id="container" class="home">
@@ -10,7 +10,7 @@
                 </div>
                 <h1>PHP Community
                 <span>Conference</span></h1>
-                <h2>March 2013</h2>
+                <h2>March 14 <span>&amp;</span> 15</h2>
                 <h3>Nashville,<span>&nbsp;</span>TN</h3>
             </div>
             <div class="aside">
@@ -21,9 +21,9 @@ <h4>The PHP Community Conference Returns in March 2013!</h4>
                 <p>In 2011, we had our first ever conference. Our sponsors,
                 speakers, and attendees were phenomenal. You rocked so much that
                 we want to do it again!</p>
-                <p>Mark your calendars for March 2013. This friendly, little PHP
-                conference is returning to Nashville, TN. Keep your eyes on this
-                space and <a href="http://twitter.com/phpcomcon">follow us on
+                <p>Mark your calendars for March 14 &amp; 15, 2013. This friendly,
+                little PHP conference is returning to Nashville, TN. Keep your eyes
+                on this space and <a href="http://twitter.com/phpcomcon">follow us on
                 Twitter</a>, for more details over the coming weeks and months.</p>
                 <p>We've archived our <a href="/2011">2011 conference web site</a>
                 for your convenience.</p>