Merge branch 'master' into prod

Author: lisamusing

.gitignore

@@ -1,2 +1,3 @@
 .DS_Store
 .*.swp
+cache/*

.htaccess

@@ -1,6 +1,6 @@
 <IfModule mod_rewrite.c>
     RewriteEngine On
-    RewriteBase /
+    #RewriteBase /~ramsey/phpcon-web/
     RewriteRule ^(resources|templates).*$ http://phpcon.org/ [R=302,L]
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteCond %{REQUEST_FILENAME} !-f

README

@@ -171,6 +171,12 @@ div#container.sub div#body {
     color: #363636;
 }
 
+div#container.sub div#registrationbody {
+    font-family: Arial, sans-serif;
+    font-size: 14px;
+    color: #363636;
+}
+
 div#container.sub h2 {
     font-size: 20px;
     text-transform: uppercase;
@@ -319,13 +325,37 @@ div#sponsors h2 {
     text-transform: uppercase;
     line-height: 20px;
     margin: 0;
+    width: 300px;
     clear: both;
 }
 
-div#sponsors div {
+div#sponsors > div {
     width: 75%;
     float: right;
+    vertical-align: top;
     clear: left;
     margin-top: -20px;
-    margin-bottom: 40px;
+    margin-bottom: 50px;
+}
+
+div.communitySponsor {
+    font-family: "NevisBold";
+    font-weight: normal;
+    width: 48px;
+    padding-right: 25px;
+    float: left;
+    font-size: 11px;
+}
+
+div.communitySponsor img {
+    vertical-align: middle;
+}
+
+div.communitySponsor > a {
+    line-height: 20px;
+    vertical-align: middle;
+}
+
+div#sponsors > div > a {
+    margin-right: 20px;
 }