Merge remote-tracking branch 'origin/master' into 2018-copy

pinaxcon/templates/static_pages/about/team.html

@@ -35,7 +35,7 @@ Our team of North Bay and Bay Area locals has years of experience building commu
 
 <h3>Christopher Neugebauer, Conference Chair</h3>
 
-<p><img src="{% static "images/team/chris.jpg" %}" alt="Christopher Neugebauer" class="team-headshot circle">Christopher is a Python developer who lives in glorious Petaluma, California, though he's originally from the the city of Hobart in Tasmania, Australia. A serial conference organizer, he has been a core organiser of PyCon Australia for a number of years, was director of linux.conf.au 2017, and a good number of his open source contributions help power the website this conference runs on. He was made a fellow of the Python Software Foundation in 2013 in recognition for his contributions to building the Australian Python community. (<a href="https://twitter.com/chrisjrn">@chrisjrn on Twitter</a>)</p>
+<p><img src="{% static "images/team/chris.jpg" %}" alt="Christopher Neugebauer" class="team-headshot circle">Christopher is a Python developer who lives in glorious Petaluma, California, though he's originally from the the city of Hobart in Tasmania, Australia. A serial conference organizer, he has been a core organiser of PyCon Australia for a number of years, was director of linux.conf.au 2017, and a good number of his open source contributions help power the website this conference runs on. He was made a fellow of the Python Software Foundation in 2013 in recognition for his contributions to building the Australian Python community, and currently serves as an at-large Director of the Python Software Foundation. (<a href="https://twitter.com/chrisjrn">@chrisjrn on Twitter</a>)</p>
 
 <h3>Sam Kitajima-Kimbrel, Program Chair</h3>
 
@@ -43,11 +43,15 @@ Our team of North Bay and Bay Area locals has years of experience building commu
 
 <h3>Andrew Godwin</h3>
 
-<p><img src="{% static "images/team/andrew.jpg" %}" alt="Andrew Godwin" class="team-headshot circle">Andrew is a Django and Python developer who originally hails from London but moved to the Bay Area four years ago. He's been writing open source software for over a decade as well as working in various different parts of the technology industry, and currently works at Eventbrite. He regularly speaks at Python (and other) events around the world, and has a keen interest in building communities and inclusivity. (<a href="https://twitter.com/andrewgodwin">@andrewgodwin on Twitter</a>)</p>
+<p><img src="{% static "images/team/andrew.jpg" %}" alt="Andrew Godwin" class="team-headshot circle">Andrew is a Django and Python developer who originally hails from London but moved to the Bay Area five years ago. He's been writing open source software for over a decade as well as working in various different parts of the technology industry, and currently works at Eventbrite. He regularly speaks at Python (and other) events around the world, and has a keen interest in building communities and inclusivity. (<a href="https://twitter.com/andrewgodwin">@andrewgodwin on Twitter</a>)</p>
 
 <h3>Josh Simmons</h3>
 <p><img src="{% static "images/team/josh.jpg" %}" alt="Josh Simmons" class="team-headshot circle">Josh is a community organizer and web developer with a penchant for armchair philosophy who was born and raised in the North Bay. He spent 4.5 years building Web &amp; Interactive Media Professionals (WIMP), a local community with over 600 members, before moving on to do community management for O'Reilly Media. These days Josh works on the Google Open Source outreach team and serves as a board member and volunteer CFO for Open Source Initiative. (<a href="https://twitter.com/joshsimmons">@joshsimmons on Twitter</a>)</p>
 
+<h3>Frances Hocutt</h3>
+<p><img src="{% static "images/team/frances.jpeg" %}" alt="Frances Hocutt" class="team-headshot circle">Frances Hocutt has taken part in the science-to-tech branch of the great STEM reshuffling. In the process, he’s written, spoken, mentored, and co-founded Seattle’s first feminist hackerspace/makerspace. Frances prefers elegance in science and effectiveness in art and is happiest when drawing on as many disciplines as possible. Frances jumped into F/OSS development with work on standards for the MediaWiki web API ecosystem and expanded into work on MediaWiki and associated Wikimedia-ecosystem contributor tools. He currently installs software on other people’s computers for Rackspace Managed Security’s defensive infrastructure team. Frances currently lives in an unfortunately catless apartment in Oakland, CA.
+ </p>
+
 
 <h2>Advisors<a name="advisors"></a></h2>