Merge branch 'master' into prod

Author: nicksloan

images/sponsor-tropo.jpg

@@ -69,6 +69,8 @@ <h2>Gold Sponsors</h2>
                 <div>
                     <a href="http://www.facebook.com/opensource/"><img src="images/sponsor-facebook.png" alt="Facebook"/></a>
                     <a href="http://microsoft.com/web/webmatrix/"><img src="images/sponsor-webmatrix.png" alt="Microsoft Web Matrix"/></a>
+                    <a href="http://tropo.com/"><img
+                        src="images/sponsor-tropo.jpg" alt="Tropo"/></a>
                 </div>
                 <h2>Silver Sponsors</h2>
                 <div>