diff --git a/Gemfile b/Gemfile
index 4ff71a3..aea34a2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
+gem 'github-pages', group: :jekyll_plugins
 
 require 'json'
 require 'open-uri'
 versions = JSON.parse(open('https://pages.github.com/versions.json').read)
-
-gem 'github-pages', versions['github-pages']
\ No newline at end of file
diff --git a/README.md b/README.md
index 12c48b2..0f9df7f 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ The Evangelist Collective is a collaborative effort of friendly people who want
 
 ## Contributing
 
-Pull Requests are more than welcome as we coordinate efforts. Here are a few notes to help you along.
+Pull Requests are more than welcome as we coordinate efforts. Here are a few notes to help you along the way.
 
 ### Editing The Site
 
@@ -15,16 +15,16 @@ For example, this section from `_layouts/default.html`:
 
      {% include portfolio_grid.html %}
 
-Loads the content defined in `_includes/css/portfolio_grid.html`. Which is pretty nifty. You can edit our site without knowing more than a little HTML. 
+Loads the content defined in `_includes/css/portfolio_grid.html`. Which is pretty nifty. You can edit our site without knowing more than a little HTML.
 
-Other things you'll want to know: 
+Other things you'll want to know:
 
 * Our fonts are loaded from `head.html`
 * The description under our logo is from `header.html`
 * The About section loads from `about.html`
 
-The portfolio is a little tricky: images are automatically loaded from the `img/portfolio` folder. The page that loads is in `_posts`. The mapping of image to post happens in the `_posts` markdown. This all renders thanks to the `modals.html` file which I haven't found a good reason to want to edit. 
+The portfolio is a little tricky: images are automatically loaded from the `img/portfolio` folder. The page that loads is in `_posts`. The mapping of image to post happens in the `_posts` markdown. This all renders thanks to the `modals.html` file which I haven't found a good reason to want to edit.
 
-## Credits 
+## Credits
 
-We rock a [MIT License]([LICENSE]). The Jekyll theme is [Freelancer](http://jekyllthemes.org/themes/freelancer/) and icons are from designers on [The Noun Project](http://thenounproject.com). [Matt Brender](http://github.com/mjbrender) made the site.
+We rock a [MIT License]([LICENSE]). The Jekyll theme is [Freelancer](http://jekyllthemes.org/themes/freelancer/) and icons are from designers on [The Noun Project](http://thenounproject.com). [Matt Broberg](http://github.com/mbbroberg) made the site.
diff --git a/_config.yml b/_config.yml
index 45f248b..d75b663 100755
--- a/_config.yml
+++ b/_config.yml
@@ -27,19 +27,20 @@ social:
   - title: github
     url: http://github.com/evangelistcollective
   - title: twitter
-    url: https://twitter.com/mjbrender/lists/wade
+    url: https://twitter.com/pinkyswearing/lists/developer-evangelists
 
 
 # Postal address (add as many lines as necessary)
 address:
   - line: The closest airport to
-  - line: San Francisco, CA (Mary)
-  - line: Arlington, Tx (Dave)
-  - line: Boston, MA (Matt)
-  - line: Boston, MA (Florian)
+  - line: San Francisco, CA (<a href="https://twitter.com/mary_grace">Mary</a>, <a href="https://twitter.com/karishannon">Shannon</a>)
+  - line: Austin, TX (<a href="https://twitter.com/ashleymcnamara">Ashley</a>)
+  - line: Portland, OR (<a href="https://twitter.com/meg_hartley">Meg</a>, <a href="https://twitter.com/mbbroberg">Matt</a>)
+  - line: Boston, MA (<a href="https://twitter.com/jonasrosland">Jonas</a>)
+  - line: New York, NY (<a href="https://twitter.com/pinkyswearing">Laura</a>)
 
 # Credits content
-credits: 'Our collective is an inclusive thought experiment started by Dave Josephsen. This site is build by <a href="https://twitter.com/mjbrender">Matt Brender</a> on Freelancer: a free to use, open source Bootstrap theme created by <a href="http://startbootstrap.com">Start Bootstrap</a>.'
+credits: 'Our collective is an inclusive thought experiment started by Dave Josephsen. This site is build by <a href="https://twitter.com/mbbroberg">Matt Broberg</a> on Freelancer: a free to use, open source Bootstrap theme created by <a href="http://startbootstrap.com">Start Bootstrap</a>.'
 
 # Build settings
 markdown: kramdown