Merge branch 'gh-pages' of github.com:jsconf/jsconf.com into gh-pages

Author: Chris Williams

images/empirejs.png renamed to images/empirejs/2012.png

@@ -129,13 +129,13 @@ <h1>JSConf<sup>&trade;</sup></h1>
       <h2>Conferences for the JavaScript community.</h2>
       <hr/>
       <div class="clearfix">
-        <div class="conf">
-          <a href="http://2014.jsconf.us/" rel="me"><img src="images/jsconf_us.png" alt="JSConf US 2013"/></a>
+        <div class="conf opencfp onsale">
+          <a href="http://2015.jsconf.us/" rel="me"><img src="images/jsconf_us.png" alt="JSConf US 2013"/></a>
           <p>JSConf US</p>
         </div>
 
-        <div class="conf opencfp">
-          <a href="http://2014.jsconf.eu/" rel="me"><img src="images/jsconf_eu.png" alt="JSConf EU"/></a>
+        <div class="conf">
+          <a href="http://2015.jsconf.eu/" rel="me"><img src="images/jsconf_eu.png" alt="JSConf EU"/></a>
           <p>JSConf EU</p>
         </div>
 
@@ -159,8 +159,8 @@ <h2>Conferences for the JavaScript community.</h2>
           <p>JSConf CO</p>
         </div>
 
-        <div class="conf opencfp">
-          <a href="http://jsconf.asia/" rel="me"><img src="images/jsconf_asia.png" alt="JSConf Asia 2013"/></a>
+        <div class="conf">
+          <a href="http://jsconf.asia/" rel="me"><img src="images/jsconf_asia.png" alt="JSConf Asia 2014"/></a>
           <p>JSConf Asia</p>
         </div>
 
@@ -169,6 +169,11 @@ <h2>Conferences for the JavaScript community.</h2>
           <p>JSConf UY</p>
         </div>
 
+        <div class="conf opencfp onsale">
+          <a href="http://jsconfbp.com/" rel="me"><img src="images/jsconf_bp.png" alt="JSConf Budapest 2015"/></a>
+          <p>JSConf Budapest</p>
+        </div>
+
       </div>
       <hr/>
       <section>JSConf is a unique conference organization, because we aren't really a conference organization at all. We are a very loose federation of developers who share the same general idea about how a technical conference should be held. We don't believe that one model or process fits all communities, in fact we are big advocates of locally run events driven by passionate individuals dedicated to the community.  We make events that aren't from the standard conference playbook because we believe you (attendees, speakers, and sponsors) deserve more than that. We focus on two things, pushing the boundaries of what is thought to be conceivable  with JS and providing exceptional human social activities that encourage community and friendship building. That sets the general tone for each of our events and from there, local individuals from each region drive the conference to its own incredible level of excellence. Our mission is to make the technology community better, more diverse, and more human; in short, we just want to make things better. JSConf does not focus on what is popular or cool now, but on topics that define and revolutionize the following year of technology. We have been the launching point for some of the most revolutionary products, services, and technologies on the web. We have also been the inspiration point and support base for a wide range of conferences beyond the "JSConf" name. Those awesome events are featured below, if you are near one, we strongly suggest you attend them!</section>
@@ -227,8 +232,8 @@ <h1 id='family'>The JSConf Family Of Events</h1>
         <a href="http://redisconf.com/" rel="nofollow"><img src="images/redisconf.png" alt="RedisConf"/></a>
           <p>RedisConf<br/>Portland, OR</p>
       </div>
-      <div class="conf">
-        <a href="http://2014.empirejs.org/" rel="nofollow"><img src="images/empirejs-2014.png" alt="EmpireJS"/></a>
+      <div class="conf opencfp onsale">
+        <a href="http://2015.empirejs.org/" rel="nofollow"><img src="images/empirejs/2015.png" alt="EmpireJS"/></a>
           <p>EmpireJS<br/>New York, NY</p>
       </div>
       <div class="conf">
@@ -266,6 +271,11 @@ <h1 id='family'>The JSConf Family Of Events</h1>
         <p>DojoConf<br/>Washington DC</p>
       </div>
 
+      <div class="conf">
+        <a href="http://midwestjs.com/" rel="nofollow"><img src="images/midwestjs.png" alt="Midwest JS"/></a>
+        <p>Midwest JS<br/>Minneapolis, MN</p>
+      </div>
+
     </div>