team includes cleanup

_src/_data/founders.yml

@@ -1,21 +0,0 @@
-- name:     Bruce Pon
-  position: CEO
-  image:    team-bruce.jpg
-  twitter:  BrucePon
-  linkedin: ponbruce
-  bio: "Bruce Pon is the CEO and co-founder of BigchainDB. Prior to BigchainDB, Bruce co-founded Avantalion International Consulting, a consulting firm specialized in building banks and industry startups in Europe and Asia for companies such as Mercedes-Benz, Volkswagen, Mitsubishi. Bruce is a board member, advisor and investor in six startups. He has an Advanced Executive Certificate from MIT Sloan and a B.Sc in Engineering from the University of Saskatchewan."
-
-- name:     Trent McConaghy
-  position: CTO
-  image:    team-trent.jpg
-  twitter:  trentmc0
-  facebook: trent.mcconaghy
-  linkedin: trentmc
-  github:   trentmc
-  bio: "Trent McConaghy has 15 years of deep technology experience with a focus on machine learning, data visualization and user experience. He was a researcher at the Canadian Department of Defense and in 1999, he co-founded Analog Design Automation Inc. and was its CTO until its acquisition by Synopsys Inc. In 2004, he co-founded Solido Design Automation Inc., once again in the role of CTO. Trent has written two critically acclaimed books on machine learning, creativity and circuit design and has authored or co-authored more than 40 papers and patents. Trent has a PhD in Engineering from KU Leuven, Belgium and Bachelor’s degrees in Engineering and in Computer Science from the University of Saskatchewan where he won awards for the top PhD thesis and top undergraduate thesis."
-
-- name:     Masha McConaghy
-  position: CMO
-  image:    team-masha.jpg
-  linkedin: mashamc
-  bio: "Masha McConaghy, curator and researcher, is a co-founder and CMO at BigchainDB and ascribe.io, a service enabling immutable attribution for artists and clear provenance for digital and physical art. She has a PhD in Arts from Pantheon-Sorbonne University, Paris and a Museology Degree from Louvre School, Paris. She has organized exhibitions throughout the world and has worked with curators at the Louvre Museum in Paris and directed a commercial gallery in Vancouver. Her current pursuits are at the intersection of art, IP and applications of new technology."

_src/_data/team.yml

@@ -1,42 +1,66 @@
+founders:
+    - name:     Bruce Pon
+      position: CEO
+      image:    team-bruce.jpg
+      twitter:  BrucePon
+      linkedin: ponbruce
+      bio: "Bruce Pon is the CEO and co-founder of BigchainDB. Prior to BigchainDB, Bruce co-founded Avantalion International Consulting, a consulting firm specialized in building banks and industry startups in Europe and Asia for companies such as Mercedes-Benz, Volkswagen, Mitsubishi. Bruce is a board member, advisor and investor in six startups. He has an Advanced Executive Certificate from MIT Sloan and a B.Sc in Engineering from the University of Saskatchewan."
 
-- name:     Daniel Lustig
+    - name:     Trent McConaghy
+      position: CTO
+      image:    team-trent.jpg
+      twitter:  trentmc0
+      facebook: trent.mcconaghy
+      linkedin: trentmc
+      github:   trentmc
+      bio: "Trent McConaghy has 15 years of deep technology experience with a focus on machine learning, data visualization and user experience. He was a researcher at the Canadian Department of Defense and in 1999, he co-founded Analog Design Automation Inc. and was its CTO until its acquisition by Synopsys Inc. In 2004, he co-founded Solido Design Automation Inc., once again in the role of CTO. Trent has written two critically acclaimed books on machine learning, creativity and circuit design and has authored or co-authored more than 40 papers and patents. Trent has a PhD in Engineering from KU Leuven, Belgium and Bachelor’s degrees in Engineering and in Computer Science from the University of Saskatchewan where he won awards for the top PhD thesis and top undergraduate thesis."
+
+    - name:     Masha McConaghy
+      position: CMO
+      image:    team-masha.jpg
+      linkedin: mashamc
+      bio: "Masha McConaghy, curator and researcher, is a co-founder and CMO at BigchainDB and ascribe.io, a service enabling immutable attribution for artists and clear provenance for digital and physical art. She has a PhD in Arts from Pantheon-Sorbonne University, Paris and a Museology Degree from Louvre School, Paris. She has organized exhibitions throughout the world and has worked with curators at the Louvre Museum in Paris and directed a commercial gallery in Vancouver. Her current pursuits are at the intersection of art, IP and applications of new technology."
+
+
+team:
+    - name:     Daniel Lustig
       position: Administrative Assistant
       image:    team-daniel.jpg
       linkedin: daniel-lustig-852a408a
 
-- name:     Krish Iyer
+    - name:     Krish Iyer
       position: Developer
       image:    team-krish.jpg
       twitter:  krish7919
       linkedin: krish7919
       github:   krish7919
 
-- name:     Simon Schwerin
+    - name:     Simon Schwerin
       position: Strategy & Business Development Intern
       image:    team-simon.jpg
       twitter:  Zimmtstern_7
       linkedin: simonschwerin
 
-- name:     Alberto Granzotto
+    - name:     Alberto Granzotto
       position: Developer
       image:    team-alberto.jpg
       twitter:  vrde
       github:   vrde
 
-- name:     Rodolphe Marques
+    - name:     Rodolphe Marques
       position: Protocols
       image:    team-rodolphe.jpg
       twitter:  rodmar_
       github:   r-marques
       linkedin: rodolphemarques
 
-- name:     Greg McMullen
+    - name:     Greg McMullen
       position: CPO
       image:    team-greg.jpg
       twitter:  gmcmullen
       linkedin: gregmcm
 
-- name:     Dimitri de Jonghe
+    - name:     Dimitri de Jonghe
       position: Application Director
       image:    team-dimitri.jpg
       twitter:  DimitriDeJonghe
@@ -44,29 +68,29 @@
       github:   diminator
       linkedin: dimitridejonghe
 
-- name:     Carly Sheridan
+    - name:     Carly Sheridan
       position: Director of Marketing and Communications
       image:    team-carly.jpg
       twitter:  _carlynoelle
       linkedin: carlysheridan
 
-- name:     Troy McConaghy
+    - name:     Troy McConaghy
       position: Developer
       image:    team-troy.jpg
       twitter:  TroyMc
 
-- name:     Wojciech Hupert
+    - name:     Wojciech Hupert
       position: UX / UI Designer
       image:    team-wojciech.jpg
       twitter:  WojciechHupert
       linkedin: wojciechhupert
 
-- name:     Kasia Kazimierczak
+    - name:     Kasia Kazimierczak
       position: Operations Manager
       image:    team-kasia.jpg
       linkedin: katarzyna-kazimierczak
 
-- name:     Sylvain Bellemare
+    - name:     Sylvain Bellemare
       position: Developer
       image:    team-sylvain.jpg
       twitter:  sbellem
@@ -74,13 +98,13 @@
       github:   sbellem
       linkedin: sylvainbellemare
 
-- name:     Tim Daubenschütz
+    - name:     Tim Daubenschütz
       position: Product Manager
       image:    team-tim.jpg
       twitter:  TimDaub
       github:   TimDaub
 
-- name:     Wrigley the Buffalo
+    - name:     Wrigley the Buffalo
       position: Community Manager
       image:    nosprite/wrigley-avatar.svg
       github:   wrigley

_src/_includes/founders.html

@@ -1,58 +0,0 @@
-
-<div class="grid grid--full grid-small--half grid-medium--third grid--gutters text-center grid--founders">
-
-    {% assign founders = site.data.founders %}
-
-    {% for member in founders %}
-    <div class="grid__col">
-        <article class="team">
-            <img class="team__image" src="/assets/img/{{ member.image }}">
-            <h1 class="team__name">{{ member.name }}</h1>
-            <p class="team__position">{{ member.position }}</p>
-
-            <p class="team__social">
-
-                {% if member.twitter %}
-                    <a class="team__social__link" href="https://twitter.com/{{ member.twitter }}">
-                        <svg class="icon icon--social icon--twitter" aria-labelledby="title">
-                            <title>Twitter</title>
-                            <use xlink:href="/assets/img/sprite.svg#twitter"></use>
-                        </svg>
-                    </a>
-                {% endif %}
-                {% if member.facebook %}
-                    <a class="team__social__link" href="https://facebook.com/{{ member.facebook }}">
-                        <svg class="icon icon--social icon--facebook" aria-labelledby="title">
-                            <title>Facebook</title>
-                            <use xlink:href="/assets/img/sprite.svg#facebook"></use>
-                        </svg>
-                    </a>
-                {% endif %}
-                {% if member.github %}
-                    <a class="team__social__link" href="https://github.com/{{ member.github }}">
-                        <svg class="icon icon--social icon--github" aria-labelledby="title">
-                            <title>GitHub</title>
-                            <use xlink:href="/assets/img/sprite.svg#github"></use>
-                        </svg>
-                    </a>
-                {% endif %}
-                {% if member.linkedin %}
-                    <a class="team__social__link" href="https://www.linkedin.com/in/{{ member.linkedin }}">
-                        <svg class="icon icon--social icon--linkedin" aria-labelledby="title">
-                            <title>LinkedIn</title>
-                            <use xlink:href="/assets/img/sprite.svg#linkedin"></use>
-                        </svg>
-                    </a>
-                {% endif %}
-
-            </p>
-
-            <p class="team__bio">{{ member.bio }}</p>
-
-        </article>
-    </div>
-    {% endfor %}
-
-</div>
-
-<span class="team__bio__trigger">Show bios</span>

_src/_includes/team.html

@@ -1,7 +1,66 @@
+<div class="grid grid--full grid-small--half grid-medium--third grid--gutters text-center grid--founders">
+
+    {% assign founders = site.data.team.founders %}
+
+    {% for member in founders %}
+    <div class="grid__col">
+        <article class="team">
+            <img class="team__image" src="/assets/img/{{ member.image }}">
+            <h1 class="team__name">{{ member.name }}</h1>
+            <p class="team__position">{{ member.position }}</p>
+
+            <p class="team__social">
+
+                {% if member.twitter %}
+                    <a class="team__social__link" href="https://twitter.com/{{ member.twitter }}">
+                        <svg class="icon icon--social icon--twitter" aria-labelledby="title">
+                            <title>Twitter</title>
+                            <use xlink:href="/assets/img/sprite.svg#twitter"></use>
+                        </svg>
+                    </a>
+                {% endif %}
+                {% if member.facebook %}
+                    <a class="team__social__link" href="https://facebook.com/{{ member.facebook }}">
+                        <svg class="icon icon--social icon--facebook" aria-labelledby="title">
+                            <title>Facebook</title>
+                            <use xlink:href="/assets/img/sprite.svg#facebook"></use>
+                        </svg>
+                    </a>
+                {% endif %}
+                {% if member.github %}
+                    <a class="team__social__link" href="https://github.com/{{ member.github }}">
+                        <svg class="icon icon--social icon--github" aria-labelledby="title">
+                            <title>GitHub</title>
+                            <use xlink:href="/assets/img/sprite.svg#github"></use>
+                        </svg>
+                    </a>
+                {% endif %}
+                {% if member.linkedin %}
+                    <a class="team__social__link" href="https://www.linkedin.com/in/{{ member.linkedin }}">
+                        <svg class="icon icon--social icon--linkedin" aria-labelledby="title">
+                            <title>LinkedIn</title>
+                            <use xlink:href="/assets/img/sprite.svg#linkedin"></use>
+                        </svg>
+                    </a>
+                {% endif %}
+
+            </p>
+
+            <p class="team__bio">{{ member.bio }}</p>
+
+        </article>
+    </div>
+    {% endfor %}
+
+</div>
+
+<span class="team__bio__trigger">Show bios</span>
+
+
 
 <div class="grid grid--full grid-small--third grid-medium--columns grid--gutters text-center grid--team">
 
-    {% assign team = site.data.team | sort: 'name' %}
+    {% assign team = site.data.team.team | sort: 'name' %}
 
     {% for member in team %}
     <div class="grid__col grid__col--2">

_src/_layouts/about.html

@@ -74,8 +74,6 @@ layout: base
         <div class="row row--wide">
             <h1 class="section-title">Team</h1>
 
-            {% include founders.html %}
-
             {% include team.html %}
         </div>
     </section>