Merge branch 'master' into usability-changes

Conflicts:
	css/logo-nav.css
	index.html

Author: cameronoelsen

css/logo-nav.css

@@ -357,7 +357,7 @@ a {
     .hubfeature h2 {
         text-align: center;
     }
-    #hubicon {
+    #hublogo {
         width: 60%;
     }
 }

index.html

@@ -205,7 +205,7 @@ <h2 style="text-align:center;">Currently in use at</h2>
         <div class="container">
             <div class="hubheader">
                 <div class="hublogo col-md-5">
-                    <img src="assets/hublogo.svg" class="img-responsive" style="margin:0 auto;" id="hubicon">
+                    <img src="assets/hublogo.svg" class="img-responsive" style="margin:0 auto;" id="hublogo">
                 </div>
                 <div class="hubdescription col-md-7">
                     <h2>Jupyter for Organizations</h2>