Merge branch 'master' into prod

Conflicts:
	fixtures/conference.json
	fixtures/sites.json

fixtures/conference.json

@@ -6,7 +6,7 @@
             "timezone": "US/Eastern",
             "start_date": "2040-01-01",
             "end_date": "2040-01-04",
-            "title": "PyconAU 2017"
+            "title": "PyCon AU 2017"
         }
     },
     {

pinaxcon/templates/site_base.html

@@ -27,7 +27,7 @@
       <link rel="stylesheet" href="{% static 'pyconau2017/css/print.css' %}" media="print">
       <link href="{% static 'pyconau2017/css/pyconau.css' %}" rel="stylesheet">
 
-      <link rel="icon" href="{% static 'pycon2017/images/favicon.ico' %}"
+      <link rel="icon" href="{% static 'pyconau2017/images/favicon.png' %}"
 
       <!--Meta tags-->
       <meta name="theme-color" content="#0c486c">

static/src/pyconau2017/css/app.css

@@ -629,23 +629,9 @@ body {
   }
 }
 
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  font-family: "Titillium Web", sans-serif;
-  font-weight: 900;
-  text-transform: uppercase;
-  margin: 0;
-  line-height: 0.9;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
 
 a {
-  color: inherit;
+  color: #337ab7;
   text-decoration: none;
   border-bottom: 1px solid #3ab1c9;
   transition: color 300ms;