diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 52b81b56e..9026212f4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -83,6 +83,16 @@ This site does not use any heavy JavaScript frameworks, and should always work w
 - jQuery is included in the WDS
 - Ruby gems is used for front end dependency management
 
+## Accessibility
+
+To test the site locally for accessibility errors, we use [pa11y-ci](https://github.com/pa11y/ci) to periodically test the site for accessibility concerns.
+
+To set up, do the following:
+
+1. `npm install`
+2. `npm install -g pa11y-ci`
+3. `npm run pa11y-ci local`
+
 ## Standards and benchmarks
 
 ### Device and browser support
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
index 8dca33000..6644b971f 100644
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -2,7 +2,7 @@ Fixes issue(s) # .
 
 [![CircleCI](https://circleci.com/gh/18F/18f.gsa.gov/tree/BRANCH_NAME.svg?style=svg)](https://circleci.com/gh/18F/18f.gsa.gov/tree/BRANCH_NAME)
 
-[:sunglasses: PREVIEW](https://federalist.18f.gov/preview/18F/18f.gsa.gov/BRANCH_NAME/)
+[:sunglasses: PREVIEW](https://federalist.fr.cloud.gov/preview/18f/18f.gsa.gov/BRANCH_NAME/)
 
 Changes proposed in this pull request:
 -
diff --git a/README.md b/README.md
index 40ba3b33e..855191f9f 100644
--- a/README.md
+++ b/README.md
@@ -2,11 +2,11 @@
 
 # 18F’s flagship website
 
-This repo houses the 18F website. We use the [Draft U.S. Web Design standards](https://standards.usa.gov/) as a front end framework. The site is built and served through [the Federalist platform](https://federalist.18f.gov).
+This repo houses the 18F website. We use the [Draft U.S. Web Design standards](https://standards.usa.gov/) as a front end framework. The site is built and served through [the Federalist platform](https://federalist.fr.cloud.gov/).
 
 ### History
 
-A detailed history of the work that went into developing this redesign can be found at [18F/beta.18f.gov](https://github.com/18F/beta.18f.gov). An archived copy of the original website can be found [on a Federalist preview](https://federalist.18f.gov/preview/18F/18f.gsa.gov/staging).
+A detailed history of the work that went into developing this redesign can be found at [18F/beta.18f.gov](https://github.com/18F/beta.18f.gov).
 
 ## Installation
 
@@ -35,23 +35,13 @@ Using Docker can make dependencies management easier, but can also slow down you
 3. Run `docker-compose build` to build the docker image and its dependencies. You only need to build once, but if there was an error with the build , rebuild using  the  `--no-cache` option like so `docker-compose build --no-cache`  to avoid using the old version of the docker image.
 4. Run `docker-compose up`.
    Note: if you want to run a single command and bypass your `Dockerfile` for debugging purposes, you can do like so `docker-compose run app <COMMAND>` (for instance, you can run bundle  `docker-compose run app bundle install`)
-5. Visit [http://192.168.99.100:4000](http://192.168.99.100:4000/) in your browser.
+5. Visit [http://192.168.99.100:4000](http://192.168.99.100:4000/site/) in your browser.
 
 ## System security controls
 
-The site is a static website with HTML, CSS, and Javascript. Deployments are done through the Federalist platform.
+The site is a static website with HTML, CSS, and Javascript. Deployments are done through Federalist.
 
-1. Federalist runs in its own organization and space in CloudFoundry
-1. Federalist Admin: https://federalist.18f.gov/
-1. Using the Federalist editor that requires GitHub Oauth and writes commits as auth'd GitHub user, changes are then passed through a webhook back to Federalist
-1. Federalist uses a CloudFoundry S3 service to write to the bucket, the Federalist instance only derives S3 credentials from the CloudFoundry S3 service and can only read/write to federalist.18f.gov/*
+1. Federalist runs in its own organization and space in [cloud.gov](https://cloud.gov/), which piggybacks on [AWS GovCloud](https://aws.amazon.com/govcloud-us/)
+1. Federalist Admin: https://federalist.fr.cloud.gov/
 1. Federalist responds to a webhook on GitHub and runs Jekyll to generate static web files and puts them in an S3 bucket
 1. We map 18f.gsa.gov URL to the S3 bucket
-
-### Constraints
-
-* We use Cloudfront to map 18f.gsa.gov to an S3 endpoint
-* Federalist, and Cloudfront do not support the following HTTPS implementations:
-  * [HSTS Headers](https://github.com/18F/18f.gsa.gov/issues/1871)
-  * [HTTP/2](https://github.com/18F/18f.gsa.gov/issues/1872)
-  * [OSCP Stapling](https://github.com/18F/18f.gsa.gov/issues/292)
diff --git a/_config-accesslint.yml b/_config-accesslint.yml
new file mode 100644
index 000000000..cd204fd5a
--- /dev/null
+++ b/_config-accesslint.yml
@@ -0,0 +1,373 @@
+---
+env: development
+exclude:
+- ".about.yml"
+- ".cfignore"
+- ".codeclimate.yml"
+- ".gitignore"
+- ".gitmodules"
+- ".hound.yml"
+- _styleguide/
+- api-endpoints
+- bin
+- build
+- circle.yml
+- config_blog.rb
+- CONTRIBUTING.md
+- docker-compose.yml
+- docker_entrypoint.rb
+- Dockerfile
+- examples/
+- favicon.ico
+- feed*
+- Gemfile*
+- humans.txt
+- ISSUE_TEMPLATE.md
+- killport
+- LICENSE.md
+- node_modules
+- package.json
+- pages/our-work.html
+- PULL_REQUEST_TEMPLATE.md
+- README.md
+- robots.txt
+- search-index*
+- serve
+- serve-blog
+- serve-fast
+- serve-accesslint
+- spec/
+- system-security-plan.yml
+- tags/
+- tests/
+- tests/schema/tags.yml
+- vendor
+- _posts/2014-03-12-coming-soon.md
+- _posts/2014-03-19-hello-world-we-are-18f.md
+- _posts/2014-03-21-29-minutes.md
+- _posts/2014-03-27-uncle-sam-wants-you-to-be-a-hero-hacker.md
+- _posts/2014-03-31-announcing-fbopen-government-opportunities-made-easier.md
+- _posts/2014-04-01-ask-us-almost-anything.md
+- _posts/2014-04-11-open-source-terms-of-service-a-better-developer.md
+- _posts/2014-04-12-how-a-pepperoni-pizza-is-inspiring-open-government.md
+- _posts/2014-04-28-18f-demo-day-may-9-2014.md
+- _posts/2014-05-09-a-few-notes-on-notalone-gov.md
+- _posts/2014-05-10-make-gov-apis-better-with-user-experience.md
+- _posts/2014-05-11-18f-shows-what-is-possible-in-government-with-fbopen.md
+- _posts/2014-05-14-hacking-bureaucracy-improving-hiring-and-software.md
+- _posts/2014-05-16-slides-from-the-inaugural-18f-demo-day.md
+- _posts/2014-05-19-packaging-up-api-usability-testing-for-agency-re-use.md
+- _posts/2014-05-29-announcing-the-developer-program-a-new-hub-for.md
+- _posts/2014-06-25-intro-to-apis-working-with-urls-json-apis-and-open.md
+- _posts/2014-07-15-hot-off-the-press-18fs-api-standards.md
+- _posts/2014-07-16-midas-a-marketplace-for-innovation-in-government.md
+- _posts/2014-07-23-take-a-gander-at-our-developer-page.md
+- _posts/2014-07-29-18f-an-open-source-team.md
+- _posts/2014-07-31-working-in-public-from-day-1.md
+- _posts/2014-08-12-the-contributors-guide-to-18f-code-for-the-common.md
+- _posts/2014-08-21-creating-an-open-fec.md
+- _posts/2014-09-04-a-new-look-at-the-freedom-of-information-act.md
+- _posts/2014-09-08-the-encasement-strategy-on-legacy-systems-and-the.md
+- _posts/2014-09-15-say-hello-to-the-new-presidential-innovation-fellows.md
+- _posts/2014-09-18-getting-to-work-for-the-american-people.md
+- _posts/2014-09-25-design-studio-onrr.md
+- _posts/2014-10-01-open-source-hack-series-midas.md
+- _posts/2014-10-21-how-to-run-your-own-3-sprint-agile-workshop.md
+- _posts/2014-11-13-why-we-use-https-in-every-gov-website-we-make.md
+- _posts/2014-11-17-taking-control-of-our-website-with-jekyll-and-webhooks.md
+- _posts/2014-11-26-how-to-use-more-open-source.md
+- _posts/2014-12-10-great-community-turnout-for-open-source-hack-night.md
+- _posts/2014-12-11-large-scale-development-culture-change.md
+- _posts/2014-12-12-going-to-gov-college.md
+- _posts/2014-12-17-snippets.md
+- _posts/2014-12-18-a-complete-list-of-gov-domains.md
+- _posts/2014-12-22-protosketch.md
+- _posts/2014-12-23-hub.md
+- _posts/2015-01-08-an-open-source-tool-for-easier-database-testing.md
+- _posts/2015-01-08-creating-a-federal-marketplace-for-agile-delivery-services.md
+- _posts/2015-01-16-open-source-for-good-government.md
+- _posts/2015-01-21-join-us.md
+- _posts/2015-02-09-the-first-gov-domains-hardcoded-into-your-browser-as-all-https.md
+- _posts/2015-02-10-a-story-of-an-agile-workshop.md
+- _posts/2015-02-12-highlights-from-the-agile-delivery-services-industry-day-events.md
+- _posts/2015-02-17-three-18f-products-that-will-help-your-workplace.md
+- _posts/2015-02-18-steve-portigal-pre-event-qa-post.md
+- _posts/2015-02-24-how-to-use-github-and-the-terminal-a-guide.md
+- _posts/2015-02-25-We-Are-Hiring.md
+- _posts/2015-02-26-Five-Ways-To-Turn-A-Bad-Idea-Into-A-Great-One.md
+- _posts/2015-02-27-making-procurement-easier-some-questions-for-developer-kaitlin-devine.md
+- _posts/2015-03-02-cos-post.md
+- _posts/2015-03-04-annoucing-oasis-discovery-making-market-research-easier.md
+- _posts/2015-03-05-Labor-Category-Descriptions-for-Agile-Procurements.md
+- _posts/2015-03-06-ux-lessons-learned-from-a-procurement-project.md
+- _posts/2015-03-11-onet-today-and-beyond.md
+- _posts/2015-03-12-day-in-the-life-of-an-18F-content-designer.md
+- _posts/2015-03-13-how-to-protosketch.md
+- _posts/2015-03-17-does-18f-pass-the-bechdel-test-for-tech.md
+- _posts/2015-03-17-for-public-comment-the-https-only-standard.md
+- _posts/2015-03-18-sunshine-week-extractive-industries-transparency-initiative-event.md
+- _posts/2015-03-19-18f-by-the-numbers.md
+- _posts/2015-03-19-how-we-built-analytics-usa-gov.md
+- _posts/2015-03-20-one-year-in-and-looking-forward.md
+- _posts/2015-03-24-making-twitter-images-more-accessible.md
+- _posts/2015-03-30-new-rfp-ghostwriting-service-to-improve-contract-success.md
+- _posts/2015-03-31-focus-on-accessibility.md
+- _posts/2015-04-01-govtechhack-hacking-for-civic-improvement.md
+- _posts/2015-04-03-18f-discussion-should-project-teams-code-first-or-design-first.md
+- _posts/2015-04-03-how-to-welcome-new-coders-to-a-civic-hackathon.md
+- _posts/2015-04-06-day-in-the-life-of-talent-manager.md
+- _posts/2015-04-07-icymi-a11yhack-accessibility-awareness-hackathon.md
+- _posts/2015-04-09-flexibility-when-releasing-a-new-product-peace-corps-new-donation-platform.md
+- _posts/2015-04-20-act-iac-event-on-devops-in-the-government.md
+- _posts/2015-04-21-hackathons-not-just-for-folks-who-code.md
+- _posts/2015-04-23-coming-soon-the-agile-delivery-services-soliciatation.md
+- _posts/2015-04-23-the-dat-team-talks-data-streams.md
+- _posts/2015-04-24-agile-developments-secret-weapon-transparency.md
+- _posts/2015-04-28-intersection-of-art-and-technology.md
+- _posts/2015-04-29-18f-how-we-write.md
+- _posts/2015-05-01-pair-programming-why-two-heads-are-better-than-one.md
+- _posts/2015-05-07-layering-innovation.md
+- _posts/2015-05-11-moveforward.md
+- _posts/2015-05-12-announcing-the-calc-tool.md
+- _posts/2015-05-12-on-culture-change-a-code-of-conduct.md
+- _posts/2015-05-14-18Fpages.md
+- _posts/2015-05-18-myusa.md
+- _posts/2015-05-19-five-questions-with-dan-brown.md
+- _posts/2015-05-21-TockingTime.md
+- _posts/2015-05-27-dan-brown-conflict-in-design.md
+- _posts/2015-05-28-18F-guides.md
+- _posts/2015-05-29-moveforward-analytics-video.md
+- _posts/2015-06-02-taking-the-pulse-of-the-federal-governments-web-presence.md
+- _posts/2015-06-03-giving-back-to-open-source.md
+- _posts/2015-06-08-data-act-data-act-explainer.md
+- _posts/2015-06-08-the-us-government-is-moving-to-https-everywhere.md
+- _posts/2015-06-11-18f-at-national-civic-hacking-day.md
+- _posts/2015-06-11-moveforward-map-give-video.md
+- _posts/2015-06-15-agile-bpa-is-here.md
+- _posts/2015-06-15-building-a-better-welcome-wagon.md
+- _posts/2015-06-16-fast-company-story.md
+- _posts/2015-06-17-what-estonia-can-teach-us-about-government-records.md
+- _posts/2015-06-22-avoiding-cloudfall.md
+- _posts/2015-06-24-thomas-vander-wal-event.md
+- _posts/2015-06-25-improving-healthcare-gov-experience.md
+- _posts/2015-07-06-18f-content-guide.md
+- _posts/2015-07-08-openfec-api.md
+- _posts/2015-07-15-openfec-api-update.md
+- _posts/2015-07-16-introduction-to-https-webinar.md
+- _posts/2015-07-17-the-new-10.md
+- _posts/2015-07-29-style-guide-for-open-source-documentation.md
+- _posts/2015-08-06-communicart-tool-will-streamline-purchase-card-process.md
+- _posts/2015-08-07-technical-debt-1.md
+- _posts/2015-08-10-18f-design-methods.md
+- _posts/2015-08-12-18f-consulting-is-hiring.md
+- _posts/2015-08-18-pif-made-permanent.md
+- _posts/2015-08-26-aaron-gustafson-beyond-responsive-design.md
+- _posts/2015-08-28-announcing-the-agile-BPA-awards.md
+- _posts/2015-08-31-how-playing-with-legos-taught-executives-agile.md
+- _posts/2015-09-01-govconnect-launch.md
+- _posts/2015-09-03-every-kid-in-a-park.md
+- _posts/2015-09-04-what-is-technical-debt.md
+- _posts/2015-09-08-reimagining-the-immigration-process.md
+- _posts/2015-09-09-how-a-two-day-spring-moved-an-agency-twenty-years-forward.md
+- _posts/2015-09-14-college-scorecard-launch.md
+- _posts/2015-09-15-federalist-platform-launch.md
+- _posts/2015-09-21-cfpb-design-speaker-series.md
+- _posts/2015-09-21-new-citizenship-resources.md
+- _posts/2015-09-22-usa-gov-launches-vote-usa-gov-to-help-citizens-register-and-connect-with-states.md
+- _posts/2015-09-28-web-design-standards.md
+- _posts/2015-10-02-building-a-better-government-design-team.md
+- _posts/2015-10-05-managing-technical-debt.md
+- _posts/2015-10-06-how-we-start-a-new-project.md
+- _posts/2015-10-07-digital-economy-practice.md
+- _posts/2015-10-08-updated-18f-content-guide.md
+- _posts/2015-10-09-cloud-gov-launch.md
+- _posts/2015-10-13-open-source-micropurchasing.md
+- _posts/2015-10-14-whats-in-a-name-understanding-and-using-gov-acronyms.md
+- _posts/2015-10-15-best-practices-for-distributed-teams.md
+- _posts/2015-10-20-digital-analytics-program-anniversary.md
+- _posts/2015-10-21-every-kid-in-a-park-follow-up.md
+- _posts/2015-10-22-preventing-technical-debt.md
+- _posts/2015-10-26-micro-purchase-criteria-announcement.md
+- _posts/2015-10-29-welcome-to-betafec.md
+- _posts/2015-11-02-useiti-what-we-learned-where-were-headed.md
+- _posts/2015-11-03-content-strategy-for-all-insights-from-cfpb-natalie-kurz.md
+- _posts/2015-11-04-complexity-is-the-adversary.md
+- _posts/2015-11-06-micro-purchase-lessons.md
+- _posts/2015-11-09-conversation-with-cfpb-natalie-kurz.md
+- _posts/2015-11-10-boston-is-using-gsa-calc-tool.md
+- _posts/2015-11-13-answering-common-questions-about-cloud-gov.md
+- _posts/2015-11-17-choose-design-over-architecture.md
+- _posts/2015-11-17-gsa-gov-refreshed-with-eye-toward-mobile-users.md
+- _posts/2015-11-18-automating-easy-government-decisions-with-machine-learning.md
+- _posts/2015-11-18-the-current-future-of-18f-marketplaces.md
+- _posts/2015-11-19-delivery-partnership-playbook.md
+- _posts/2015-11-20-how-we-use-a-lean-approach-to-product-design.md
+- _posts/2015-11-30-complex-data-in-useiti.md
+- _posts/2015-12-01-how-we-dramatically-improved-18fs-onboarding-process-in-3-months.md
+- _posts/2015-12-02-analytics-usa-gov-new-features-more-data.md
+- _posts/2015-12-03-epa-environmental-digital-services-marketplace.md
+- _posts/2015-12-03-power-of-mindset-normatives-matthew-milan.md
+- _posts/2015-12-07-what-exactly-do-we-even-do-all-day.md
+- _posts/2015-12-08-learning-how-to-build-a-better-front-door-for-the-federal-government.md
+- _posts/2015-12-08-using-emoji-for-knowledge-sharing.md
+- _posts/2015-12-09-an-open-source-government-is-a-faster-more-efficient-government.md
+- _posts/2015-12-11-how-we-test-18f-gsa-gov.md
+- _posts/2015-12-15-how-bot-named-dolores-landingham-transformed-18fs-onboarding.md
+- _posts/2015-12-16-useiti-whats-in-first-report.md
+- _posts/2015-12-17-plain-language-betafec-new-content-design.md
+- _posts/2015-12-17-the-agile-bpa-is-ready-to-launch.md
+- _posts/2015-12-22-uk-digital-service-visits-us-to-begin-series-of-exchanges.md
+- _posts/2015-12-23-looking-back-2015-our-own-words.md
+- _posts/2015-12-29-is-your-project-using-agilefall.md
+- _posts/2015-12-30-turning-learning-up-to-11.md
+- _posts/2016-01-04-turning-learning-up-to-11-transparency.md
+- _posts/2016-01-05-turning-learning-up-to-11-knowledge-sharing.md
+- _posts/2016-01-06-tips-for-adapting-analytics-usa-gov.md
+- _posts/2016-01-07-announcing-the-18f-micro-purchase-platform.md
+- _posts/2016-01-08-18f-new-years-resolution-be-even-more-open.md
+- _posts/2016-01-11-introducing-the-css-coding-style-guide.md
+- _posts/2016-01-12-hacking-inclusion-by-customizing-a-slack-bot.md
+- _posts/2016-01-15-micro-purchase-auctions-round-2-what-we-learned.md
+- _posts/2016-01-21-what-we-can-learn-from-the-interiors-social-feeds.md
+- _posts/2016-01-22-18f-writing-lab.md
+- _posts/2016-01-25-how-user-story-estimation-helps-my-team-deliver-value.md
+- _posts/2016-02-02-new-us-digital-registry-authenticates-official-public-service-accounts.md
+- _posts/2016-02-09-tips-for-capturing-the-best-data-from-user-interviews.md
+- _posts/2016-02-10-bringing-iterative-development-to-our-talent-team.md
+- _posts/2016-02-12-happy-valentines-day-from-18F.md
+- _posts/2016-02-18-analytics.usa.gov-agency-specific-dashboards.md
+- _posts/2016-02-19-how-and-why-we-built-the-micro-purchase-platform.md
+- _posts/2016-02-23-software-maintenance-is-an-anti-pattern.md
+- _posts/2016-02-24-two-new-open-positions-to-guide-our-business-and-our-people.md
+- _posts/2016-02-29-informing-the-future-of-the-federal-front-door.md
+- _posts/2016-03-01-what-we-learned-after-interviewing-people-about-their-interactions-with-the-federal-government.md
+- _posts/2016-03-02-strategies-people-use-when-interacting-with-the-federal-government.md
+- _posts/2016-03-03-five-questions-for-the-nasa-chief-historian.md
+- _posts/2016-03-03-how-people-learn-to-navigate-government-services.md
+- _posts/2016-03-04-how-people-use-proxies-to-interact-with-the-government.md
+- _posts/2016-03-07-the-need-for-transparency-in-government.md
+- _posts/2016-03-08-san-diego-summit-opens-doors-to-technology-partnerships.md
+- _posts/2016-03-08-too-many-options-make-complicated-decisions-harder.md
+- _posts/2016-03-09-trust-as-a-two-way-street.md
+- _posts/2016-03-10-announcing-the-launch-of-the-digital-acquisitions-pilot.md
+- _posts/2016-03-10-what-people-think-about-before-sharing-personal-information.md
+- _posts/2016-03-11-designing-services-that-are-accessible-transparent-and-easy-to-use.md
+- _posts/2016-03-15-treasury-and-the-data-act-full-of-sunshine.md
+- _posts/2016-03-16-making-the-draft-web-design-standards-better-through-feedback.md
+- _posts/2016-03-18-18f-year-two-by-the-numbers.md
+- _posts/2016-03-18-how-user-archetypes-informed-the-draft-us-web-design-standards.md
+- _posts/2016-03-21-we-asked-100-of-our-coworkers-why-did-you-join-18f.md
+- _posts/2016-03-22-helping-california-buy-a-new-child-welfare-system.md
+- _posts/2016-03-22-what-was-your-path-to-18f.md
+- _posts/2016-03-23-how-to-integrate-the-draft-us-web-design-standards-into-existing-projects.md
+- _posts/2016-03-23-what-have-you-loved-working-on.md
+- _posts/2016-03-24-video-highlights-from-18f-speeches-over-the-last-year.md
+- _posts/2016-03-25-how-design-consistency-helps-users-navigate-federal-websites.md
+- _posts/2016-03-28-interesting-things-we-learned-from-examining-traffic-patterns-on-analytics-usa-gov.md
+- _posts/2016-03-29-best-practices-for-building-an-accessible-website-using-the-draft-us-web-design-standards.md
+- _posts/2016-03-30-how-we-shared-a-visual-style-across-multiple-sites.md
+- _posts/2016-03-31-new-guide-provides-tools-for-product-leads.md
+- _posts/2016-04-01-developing-the-draft-us-web-design-standards-ui-components.md
+- _posts/2016-04-01-what-10-weeks-at-18f-taught-me.md
+- _posts/2016-04-04-national-earthquake-information-centers-open-source-team.md
+- _posts/2016-04-05-three-teams-using-the-draft-us-web-design-standards-talk-about-their-experiences.md
+- _posts/2016-04-06-take-our-code-18f-projects-you-can-reuse.md
+- _posts/2016-04-08-how-we-get-high-availability-with-elasticsearch-and-ruby-on-rails.md
+- _posts/2016-04-08-making-more-consistent-decisions-with-design-principles-a-new-18f-guide.md
+- _posts/2016-04-12-7-18f-projects-that-state-and-local-governments-can-reuse.md
+- _posts/2016-04-15-compliance-masonry-buildling-a-risk-management-platform.md
+- _posts/2016-04-18-the-teams-they-are-a-changin.md
+- _posts/2016-04-19-looking-at-the-different-ways-to-test-content.md
+- _posts/2016-04-20-a-clear-audience-makes-for-a-good-blog-post.md
+- _posts/2016-04-21-checklistomania-makes-it-easy-to-keep-track-of-relative-tasks.md
+- _posts/2016-04-22-what-is-an-api.md
+- _posts/2016-04-25-lean-on-me-asking-for-help-on-the-content-team.md
+- _posts/2016-04-26-thinking-about-the-future-of-the-post-office-an-interview-with-amanda-weaver.md
+- _posts/2016-04-27-making-a-distributed-design-team-work.md
+- _posts/2016-04-28-a-guide-to-the-18f-writing-lab.md
+- _posts/2016-05-02-from-spreadsheet-to-api-to-app-a-better-contract-forecast-tool.md
+- _posts/2016-05-03-delivering-the-next-generation-of-digital-government.md
+- _posts/2016-05-06-the-day-90-kids-came-to-code-with-18f.md
+- _posts/2016-05-10-building-a-modern-shared-authentication-platform.md
+- _posts/2016-05-10-gsa-invests-in-18fs-work-with-new-service.md
+- _posts/2016-05-11-tackling-challenges-facing-cities-in-collaboration-with-all-levels-of-government.md
+- _posts/2016-05-12-introducing-18fs-new-visual-identity.md
+- _posts/2016-05-13-how-18f-handles-information-security-and-third-party-applications.md
+- _posts/2016-05-17-reimagining-federal-websites-with-the-draft-us-web-design-standards.md
+- _posts/2016-05-18-why-were-moving-18f-gsa-gov-to-federalist.md
+- _posts/2016-05-19-content-debt-what-it-is-where-to-find-it-and-how-to-prevent-it-in-the-first-place.md
+- _posts/2016-05-20-get-your-pass-for-kids-to-parks-day.md
+- _posts/2016-05-23-a-sestina-on-sunsetting-content.md
+- _posts/2016-05-24-the-user-centered-redesign-of-identitytheft-gov.md
+- _posts/2016-05-31-taking-an-agile-approach-to-content.md
+- _posts/2016-06-02-open-data-democratizes-innovation.md
+- _posts/2016-06-07-building-better-by-building-together-with-the-federal-election-commission.md
+- _posts/2016-06-14-prototype-early-prototype-often-lesson-from-the-data-act.md
+- _posts/2016-06-15-two-agencies-participating-in-the-digital-acquisition-accelerator-pilot.md
+- _posts/2016-06-16-emanuel-feld-talks-about-his-vizualization-of-government-github-organizations.md
+- _posts/2016-06-17-exciting-additions-to-analytics-usa-gov.md
+- _posts/2016-06-20-build-empathy-with-stakeholder-interviews-part-1-preparation.md
+- _posts/2016-06-21-using-plain-language-to-bridge-the-gap-between-government-and-industry.md
+- _posts/2016-06-24-5-lessons-in-object-oriented-design-from-sandi-metz.md
+- _posts/2016-06-30-6-ways-a-writing-lab-will-help-your-organization.md
+- _posts/2016-07-06-illinois-fourth-grade-class-uses-every-kid-in-a-park-to-explore.md
+- _posts/2016-07-07-when-a-micropurchase-doesnt-work-out-we-try-to-learn-from-it.md
+- _posts/2016-07-11-conversation-about-static-dynamic-websites.md
+- _posts/2016-07-13-3-ways-for-digital-acqusition-teams-to-work-better.md
+- _posts/2016-07-13-technology-transformation-services-looking-for-new-commissioner.md
+- _posts/2016-07-14-elaine-kamlley-a-developer-commited-diversity.md
+- _posts/2016-07-18-cloud-gov-full-steam-ahead-fedramp-assessment-process.md
+- _posts/2016-07-19-strategies-for-starting-your-own-writing-lab.md
+- _posts/2016-07-21-buying-better-digital-products-part-1-proto-personas-and-understanding-the-problem.md
+- _posts/2016-07-22-building-empathy-with-stakeholder-interviews-part-2-conversation.md
+- _posts/2016-07-26-buying-better-digital-products-part-2-setting-the-product-vision-and-strategy.md
+- _posts/2016-07-26-new-pilot-aims-to-streamline-notice-and-comment-process.md
+- _posts/2016-07-28-bret-mogilefsky-finding-big-good-cloud-gov.md
+- _posts/2016-07-29-live-streamed-demos-for-exponential-transparency-and-information-sharing.md
+- _posts/2016-08-02-jacob-harris-from-big-data-journalism-to-micro-purchase-platforms.md
+- _posts/2016-08-04-buying-better-digital-products-part-3-mapping-user-stories.md
+- _posts/2016-08-08-facts-about-publishing-open-source-code-in-government.md
+- _posts/2016-08-09-the-role-of-bot-bidding-in-micro-purchase-auctions.md
+- _posts/2016-08-10-patterns-for-managing-multi-tenant-cloud-environments.md
+- _posts/2016-08-11-holly-allen-helping-engineer-a-better-18F.md
+- _posts/2016-08-16-what-happens-when-the-whole-team-joins-user-interviews.md
+- _posts/2016-08-25-micro-purchase-design-philosophy-do-one-thing-well.md
+- _posts/2016-08-26-mark-trammell-unlocking-the-true-potential-of-public-service.md
+- _posts/2016-08-29-data-act-prototype-simplicty-is-key.md
+- _posts/2016-08-30-sign-up-for-the-technology-industry-day.md
+- _posts/2016-08-31-kanban-for-government.md
+- _posts/2016-09-06-nicole-fenton-a-wordsmith-joins-government.md
+- _posts/2016-09-12-james-scott-automating-engineering-better-government.md
+- _posts/2016-09-15-gao-report-shows-satisfied-customers-areas-for-improvement.md
+- _posts/2016-09-19-vendors-government-strengthen-partnership-technology-industry-day.md
+- _posts/2016-09-20-mississippi-agile-modular-techniques-child-welfare-system.md
+- _posts/2016-09-27-pro-tips-for-data-friendly-regulations-proposals.md
+- _posts/2016-09-27-usa-gov-updates-vote-gov-now-leaner-faster-multilingual.md
+- _posts/2016-10-03-using-rfps-make-every-dollar-count.md
+- _posts/2016-10-04-what-is-static-source-analysis.md
+- _posts/2016-10-11-getting-the-most-juice-out-of-the-squeeze.md
+- _posts/2016-10-12-announcing-the-digital-acquisition-accelerator-playbook.md
+- _posts/2016-10-14-iterative-workplace-design-denver-federal-center.md
+- _posts/2016-10-24-embracing-opportunities-to-improve-and-innovate.md
+- _posts/2016-10-25-three-small-steps-you-can-take-to-reboot-agile-in-your-organization.md
+- _posts/2016-10-26-writing-for-web-easy-writing-for-users-not.md
+- _posts/2016-10-28-california-takes-new-approach-procurement.md
+- _posts/2016-11-04-code-gov-the-next-milestone-federal-open-source-code.md
+- _posts/2016-11-14-modular-procurement-state-local-government.md
+- _posts/2016-11-17-leadership-innovation-california-child-welfare-services.md
+- _posts/2016-11-22-a-vulnerability-disclosure-policy-for-the-technology-transformation-service.md
+- _posts/2016-11-25-what-18f-is-thankful-for-this-thanksgiving.md
+- _posts/2016-11-30-curate-best-thinking-available.md
+- _posts/2016-12-02-presidential-innovation-fellows-now-accepting-applications-spring-2017.md
+- _posts/2016-12-12-connecting-culture-change-at-18F-and-PBS.md
+- _posts/2016-12-13-lowering-risk-of-experimentation-open-source-code.md
+- _posts/2016-12-14-how-to-run-an-efficient-meeting.md
+- _posts/2016-12-15-tts-projects-forward-open-government-partnership-principles.md
+- _posts/2016-12-22-charting-the-future-of-the-draft-us-web-design-standards.md
+- _posts/2017-01-04-tracking-the-us-governments-progress-on-moving-https.md
+- _posts/2017-01-05-building-effective-agile-partnership-between-government-industry.md
+- _posts/2017-01-06-open-source-collaboration-across-agencies-to-improve-https-deployment.md
+- _posts/2017-01-10-mark-hopson-negotiating-on-americas-behalf.md
+- _posts/2017-01-11-the-best-way-to-build-big-is-to-start-small.md
+---
+
diff --git a/_config-blog.yml b/_config-blog.yml
index b8bcd43e6..f479046ed 100644
--- a/_config-blog.yml
+++ b/_config-blog.yml
@@ -1,19 +1,19 @@
-env: "development"
-
+---
+env: development
 exclude:
-- .about.yml
-- .cfignore
-- .codeclimate.yml
-- .gitignore
-- .gitmodules
-- .hound.yml
-- _pages
+- ".about.yml"
+- ".cfignore"
+- ".codeclimate.yml"
+- ".gitignore"
+- ".gitmodules"
+- ".hound.yml"
 - api-endpoints
 - bin
 - build
 - circle.yml
+- config_blog.rb
 - CONTRIBUTING.md
-- docker-compse.yml
+- docker-compose.yml
 - docker_entrypoint.rb
 - Dockerfile
 - examples/
@@ -22,6 +22,7 @@ exclude:
 - Gemfile*
 - humans.txt
 - ISSUE_TEMPLATE.md
+- killport
 - LICENSE.md
 - node_modules
 - package.json
@@ -34,7 +35,7 @@ exclude:
 - serve-blog
 - serve-fast
 - serve-accesslint
-- sitemap.xml
+- spec/
 - system-security-plan.yml
 - tests/
 - tests/schema/tags.yml
@@ -316,7 +317,7 @@ exclude:
 - _posts/2016-07-18-cloud-gov-full-steam-ahead-fedramp-assessment-process.md
 - _posts/2016-07-19-strategies-for-starting-your-own-writing-lab.md
 - _posts/2016-07-21-buying-better-digital-products-part-1-proto-personas-and-understanding-the-problem.md
-- _posts/2016-07-22-building-emphathy-with-stakeholder-interviews-part-2-conversation.md
+- _posts/2016-07-22-building-empathy-with-stakeholder-interviews-part-2-conversation.md
 - _posts/2016-07-26-buying-better-digital-products-part-2-setting-the-product-vision-and-strategy.md
 - _posts/2016-07-26-new-pilot-aims-to-streamline-notice-and-comment-process.md
 - _posts/2016-07-28-bret-mogilefsky-finding-big-good-cloud-gov.md
@@ -347,7 +348,6 @@ exclude:
 - _posts/2016-10-14-iterative-workplace-design-denver-federal-center.md
 - _posts/2016-10-24-embracing-opportunities-to-improve-and-innovate.md
 - _posts/2016-10-25-three-small-steps-you-can-take-to-reboot-agile-in-your-organization.md
-- _posts/2016-07-22-building-empathy-with-stakeholder-interviews-part-2-conversation.md
 - _posts/2016-10-26-writing-for-web-easy-writing-for-users-not.md
 - _posts/2016-10-28-california-takes-new-approach-procurement.md
 - _posts/2016-11-04-code-gov-the-next-milestone-federal-open-source-code.md
@@ -366,3 +366,6 @@ exclude:
 - _posts/2017-01-05-building-effective-agile-partnership-between-government-industry.md
 - _posts/2017-01-06-open-source-collaboration-across-agencies-to-improve-https-deployment.md
 - _posts/2017-01-10-mark-hopson-negotiating-on-americas-behalf.md
+- _posts/2017-01-11-the-best-way-to-build-big-is-to-start-small.md
+---
+
diff --git a/_config-fast-builds.yml b/_config-fast-builds.yml
index d532c9ccb..77d22dea1 100644
--- a/_config-fast-builds.yml
+++ b/_config-fast-builds.yml
@@ -7,7 +7,6 @@ jekyll_pages_api_search:
   skip_index: true
 
 env: "development"
-
 exclude:
 - .about.yml
 - .cfignore
@@ -15,13 +14,13 @@ exclude:
 - .gitignore
 - .gitmodules
 - .hound.yml
-- _pages
 - api-endpoints
 - bin
 - build
 - circle.yml
+- config_blog.rb
 - CONTRIBUTING.md
-- docker-compse.yml
+- docker-compose.yml
 - docker_entrypoint.rb
 - Dockerfile
 - examples/
@@ -30,6 +29,7 @@ exclude:
 - Gemfile*
 - humans.txt
 - ISSUE_TEMPLATE.md
+- killport
 - LICENSE.md
 - node_modules
 - package.json
@@ -43,6 +43,7 @@ exclude:
 - serve-fast
 - serve-accesslint
 - sitemap.xml
+- spec/
 - system-security-plan.yml
 - tests/
 - tests/schema/tags.yml
diff --git a/_config.yml b/_config.yml
index baba08c94..7573251d3 100644
--- a/_config.yml
+++ b/_config.yml
@@ -123,28 +123,27 @@ exclude:
 - bin
 - build
 - circle.yml
+- config_blog.rb
 - CONTRIBUTING.md
-- docker-compse.yml
+- docker-compose.yml
 - docker_entrypoint.rb
 - Dockerfile
+- examples/
 - favicon.ico
-- feed*
 - Gemfile*
-- humans.txt
 - ISSUE_TEMPLATE.md
+- killport
 - LICENSE.md
 - node_modules
 - package.json
 - pages/our-work.html
 - PULL_REQUEST_TEMPLATE.md
 - README.md
-- robots.txt
-- search-index*
 - serve
 - serve-blog
 - serve-fast
 - serve-accesslint
-- sitemap.xml
+- spec/
 - system-security-plan.yml
 - tests/
 - tests/schema/tags.yml
diff --git a/_includes/navigation.html b/_includes/navigation.html
index 97702f79d..26d3240e8 100644
--- a/_includes/navigation.html
+++ b/_includes/navigation.html
@@ -21,9 +21,6 @@
 
 
 {% if include.subnav %}
-  {% assign subnav_page_url = include.subnav_anchor | default: page.url %}
-  {% assign page_data = subnav_page_url | find_page: nav_items %}
-
   {% if page.nav_items %}
     {% include navigation/subnav.html
        page_data=page
@@ -31,6 +28,8 @@
        children=true
     %}
   {% else %}
+    {% assign subnav_page_url = include.subnav_anchor | default: page.url %}
+    {% assign page_data = subnav_page_url | find_page: nav_items %}
     {% include navigation/subnav.html
        page_data=page_data
        children=true
diff --git a/_plugins/author.rb b/_plugins/author.rb
index d3bb447f0..f6f4cb232 100755
--- a/_plugins/author.rb
+++ b/_plugins/author.rb
@@ -1,6 +1,3 @@
-require 'pry'
-require 'rb-readline'
-
 module Jekyll
   class AuthorTag < Liquid::Tag
     def initialize(tag_name, author, tokens)
@@ -24,11 +21,11 @@ def render(_context)
     end
 
     def finder(group, name)
-      data = Jekyll.sites[0].data[group]
       if results.respond_to?('find')
         return results.find { |member| member['name'] == name }
       else
-        require 'pry';        end
+        raise Exception, "No teammate found by that name: #{name}"
+      end
     end
   end
 
@@ -45,7 +42,6 @@ def initialize(tag_name, heading, tokens)
     def render(context)
       authored = []
       author = context.environments[0]['page']['name']
-      full_name = context.environments[0]['page']['full_name']
       first_name = context.environments[0]['page']['first_name']
       posts = context.environments[0]['site']['posts']
       site_url = context.environments[0]['site']['baseurl']
@@ -145,7 +141,7 @@ def team_link(input)
         name = authors[index].data['name'].downcase
         url = "#{site_url}/author/#{name}"
         full_name = authors[index].data['full_name']
-        string = "<a class='post-author' itemprop='name' href='#{url}'>#{full_name}</a>"
+        "<a class='post-author' itemprop='name' href='#{url}'>#{full_name}</a>"
       end
     end
   end
diff --git a/_plugins/author_data.rb b/_plugins/author_data.rb
index f3306a4c6..7fdf45a74 100644
--- a/_plugins/author_data.rb
+++ b/_plugins/author_data.rb
@@ -1,6 +1,4 @@
 require 'yaml'
-require 'rb-readline'
-require 'pry'
 
 module SiteData
   class AuthorData
@@ -9,13 +7,16 @@ class AuthorData
     def initialize(test_path = nil)
       @test_path = test_path
       @basepath = @test_path ? @test_path : Dir.pwd
+
       @path = File.join(@basepath, '_authors')
+      cwd = File.dirname(__FILE__)
+      pwd = cwd.split('/')[0...-1].join('/')
 
-      @site_post_paths = Dir.entries(File.join(Dir.pwd, '_posts')).select do |f|
+      @site_post_paths = Dir.entries(File.join(pwd, '_posts')).select do |f|
         !File.directory? f and f != '.DS_Store'
       end
 
-      @all_authors = Dir.entries(File.join(Dir.pwd, '_authors')).select do |f|
+      @all_authors = Dir.entries(File.join(pwd, '_authors')).select do |f|
         !File.directory? f and f != '.DS_Store'
       end.flatten.uniq
 
diff --git a/_plugins/related_posts.rb b/_plugins/related_posts.rb
index d6d24292e..666cd0d09 100644
--- a/_plugins/related_posts.rb
+++ b/_plugins/related_posts.rb
@@ -1,5 +1,3 @@
-require 'pry'
-require 'rb-readline'
 module Jekyll
   class RelGenerator < Liquid::Tag
     def initialize(related_posts, text, tokens)
@@ -10,11 +8,11 @@ def initialize(related_posts, text, tokens)
 
     # Gets all posts from the site by tag and adds those that match the tags on
     # the current page. Returns a flattened, deduped, array of post objects
-    def get_posts_by_tag(page, siteTags)
+    def get_posts_by_tag(page, site_tags)
       tags = page['tags']
       other_posts = []
       for tag in tags
-        other_posts.push(siteTags[tag])
+        other_posts.push(site_tags[tag])
         other_posts = other_posts.flatten.uniq
         other_posts.delete_if { |post| page['title'] == post['title'] }
       end
@@ -25,10 +23,15 @@ def get_posts_by_tag(page, siteTags)
     # to other posts authored on the site. This may take a long time for large
     # sites. Returns an array of posts
     def get_posts_by_author(other_posts, page, site)
-      posts = site['posts']
       if page['authors']
         authors = page['authors']
-        authors.map { |author| posts.map { |post| if post.data['authors'] && post.data['authors'].index(author) then other_posts.push(post) end } }
+        authors.map do |author|
+          site['posts'].map do |post|
+            if post.data['authors'] && post.data['authors'].index(author)
+            then other_posts.push(post)
+            end
+          end
+        end
       end
       other_posts.delete_if { |post| page['title'] == post['title'] }
       other_posts
@@ -40,7 +43,10 @@ def list_posts(other_posts)
       internal = @params[1] || 'li'
       if other_posts
         related_posts = "<#{external}>"
-        other_posts.flatten.map { |post| related_posts << "<#{internal}><a href='#{@baseurl}#{post.url}' class='related_posts'>&ldquo;#{post.data['title']}&rdquo;</a></#{internal}>" }
+        other_posts.flatten.map do |post|
+          related_posts << "<#{internal}><a href='#{@baseurl}#{post.url}' \
+            class='related_posts'>&ldquo;#{post.data['title']}&rdquo;</a></#{internal}>"
+        end
         related_posts << "</#{external}"
       else
         related_posts = '<p>No related posts</p>'
@@ -53,10 +59,10 @@ def list_posts(other_posts)
     def render(context)
       page = context['page']
       site = context['site']
-      siteTags = site['tags']
-      other_posts = get_posts_by_tag(page, siteTags)
+      site_tags = site['tags']
+      other_posts = get_posts_by_tag(page, site_tags)
       other_posts = get_posts_by_author(other_posts, page, site) if other_posts.flatten.length < 3
-      related_posts = list_posts(other_posts.uniq.take(3))
+      list_posts(other_posts.uniq.take(3))
     end
   end
 end
diff --git a/_plugins/utility.rb b/_plugins/utility.rb
index 2c80d36da..49e621cbb 100644
--- a/_plugins/utility.rb
+++ b/_plugins/utility.rb
@@ -1,6 +1,3 @@
-require 'pry'
-require 'rb-readline'
-
 module Jekyll
   module Utility
     attr_reader :match
diff --git a/_projects/calc.md b/_projects/calc.md
index 105096e27..b11eaf20c 100644
--- a/_projects/calc.md
+++ b/_projects/calc.md
@@ -11,6 +11,8 @@ tag: calc
 expiration_date:
 github_repo: https://github.com/18F/calc
 project_url: "[CALC tool](https://calc.gsa.gov/)"
+quote: CALC was built to save hours spent on market research and price analysis for federal government contracts, and has the potential to save millions of taxpayer dollars on services contracts.
+quote_source: "Kelly Bailey, Product Owner of CALC, Federal Acquisition Service"
 ---
 
 The General Services Administration (GSA) plays a central role in helping the rest of the federal government hire contractors to perform professional services. This process requires contracting officers to research past federal contracts to determine a fair hourly rate, which often involves manually searching through stacks of paper contracts to find old labor rates.
diff --git a/_projects/dhs-myuscis.md b/_projects/dhs-myuscis.md
index 3bcb9d374..99c93a797 100644
--- a/_projects/dhs-myuscis.md
+++ b/_projects/dhs-myuscis.md
@@ -6,7 +6,7 @@ subtitle: Humanizing the process of becoming a citizen
 permalink: /what-we-deliver/myuscis/
 redirect_from: /project/dhs-myuscis/
 excerpt: We worked with Citizenship and Immigration Services to make the process of applying for citizenship a little friendlier.
-image: /assets/img/home/hero-immigration.png
+image: /assets/img/home/hero-immigration.jpg
 image_accessibility: "New citizens with their hands raised for the citizenship oath at a naturalization ceremony"
 tag: uscis
 project_url: "[myUSCIS website](https://my.uscis.gov/)"
diff --git a/_projects/doi-every-kid-in-a-park.md b/_projects/doi-every-kid-in-a-park.md
index e36ccafc3..9470ca3c6 100644
--- a/_projects/doi-every-kid-in-a-park.md
+++ b/_projects/doi-every-kid-in-a-park.md
@@ -6,7 +6,7 @@ subtitle: Designing for every user
 permalink: /what-we-deliver/every-kid-in-a-park/
 redirect_from: /project/every-kid-in-a-park/
 excerpt: We helped the Department of the Interior reach fourth graders and help kids discover public lands through the Every Kid in a Park program.
-image: /assets/img/home/hero-ekiap.png
+image: /assets/img/home/hero-ekiap.jpg
 image_accessibility: Children proudly showing their national park badges
 tag: every kid in a park
 expiration_date:
diff --git a/_projects/hhs-states.md b/_projects/hhs-states.md
index c03553d77..ec8becae8 100644
--- a/_projects/hhs-states.md
+++ b/_projects/hhs-states.md
@@ -6,7 +6,7 @@ subtitle: Helping states update crucial systems
 permalink: /what-we-deliver/hhs-states/
 redirect_from: /project/hhs-states/
 excerpt: Health and Human Services hired us to help states implement best practices and upgrade legacy systems.
-image: /assets/img/projects/hero_stateandlocal.png
+image: /assets/img/projects/hero_stateandlocal.jpg
 image_accessibility: "Photograph of people meeting in small groups during a workshop"
 tag: state and local practice
 expiration_date:
diff --git a/assets/img/arrow-left.png b/assets/img/arrow-left.png
index 12b5583c9..f1d55ac9b 100755
Binary files a/assets/img/arrow-left.png and b/assets/img/arrow-left.png differ
diff --git a/assets/img/arrow-up.png b/assets/img/arrow-up.png
index d141420dd..41fc06c33 100644
Binary files a/assets/img/arrow-up.png and b/assets/img/arrow-up.png differ
diff --git a/assets/img/arrows/bright/arrow-right-hover.png b/assets/img/arrows/bright/arrow-right-hover.png
index 6277d7082..0d7f3ce80 100644
Binary files a/assets/img/arrows/bright/arrow-right-hover.png and b/assets/img/arrows/bright/arrow-right-hover.png differ
diff --git a/assets/img/arrows/bright/arrow-right.png b/assets/img/arrows/bright/arrow-right.png
index a72d0feeb..f49867eb5 100644
Binary files a/assets/img/arrows/bright/arrow-right.png and b/assets/img/arrows/bright/arrow-right.png differ
diff --git a/assets/img/arrows/medium/arrow-left-hover.png b/assets/img/arrows/medium/arrow-left-hover.png
index 864e91a05..5ae6aa720 100644
Binary files a/assets/img/arrows/medium/arrow-left-hover.png and b/assets/img/arrows/medium/arrow-left-hover.png differ
diff --git a/assets/img/arrows/medium/arrow-left.png b/assets/img/arrows/medium/arrow-left.png
index a0a15e544..0447d163d 100644
Binary files a/assets/img/arrows/medium/arrow-left.png and b/assets/img/arrows/medium/arrow-left.png differ
diff --git a/assets/img/arrows/medium/arrow-right-hover.png b/assets/img/arrows/medium/arrow-right-hover.png
index 09e630005..f583c8637 100644
Binary files a/assets/img/arrows/medium/arrow-right-hover.png and b/assets/img/arrows/medium/arrow-right-hover.png differ
diff --git a/assets/img/arrows/medium/arrow-right-visited.png b/assets/img/arrows/medium/arrow-right-visited.png
index 24ad18d89..2967dfe2f 100644
Binary files a/assets/img/arrows/medium/arrow-right-visited.png and b/assets/img/arrows/medium/arrow-right-visited.png differ
diff --git a/assets/img/arrows/medium/arrow-right.png b/assets/img/arrows/medium/arrow-right.png
index 0939ff52f..1f06e5d41 100644
Binary files a/assets/img/arrows/medium/arrow-right.png and b/assets/img/arrows/medium/arrow-right.png differ
diff --git a/assets/img/blog/cityscape.png b/assets/img/blog/cityscape.png
index eea2f7e54..89d023328 100644
Binary files a/assets/img/blog/cityscape.png and b/assets/img/blog/cityscape.png differ
diff --git a/assets/img/blog/content-debt.png b/assets/img/blog/content-debt.png
index e531fd40d..33fb7edcc 100644
Binary files a/assets/img/blog/content-debt.png and b/assets/img/blog/content-debt.png differ
diff --git a/assets/img/blog/every-kid-in-a-park-homepage.png b/assets/img/blog/every-kid-in-a-park-homepage.png
index a99dd2896..a5c59ce74 100644
Binary files a/assets/img/blog/every-kid-in-a-park-homepage.png and b/assets/img/blog/every-kid-in-a-park-homepage.png differ
diff --git a/assets/img/blog/glacier-park-lg.png b/assets/img/blog/glacier-park-lg.png
index 2a8b1bf3e..473ed23a6 100644
Binary files a/assets/img/blog/glacier-park-lg.png and b/assets/img/blog/glacier-park-lg.png differ
diff --git a/assets/img/blog/glacier-park-sm.png b/assets/img/blog/glacier-park-sm.png
index d5a70f4e4..802518dc0 100644
Binary files a/assets/img/blog/glacier-park-sm.png and b/assets/img/blog/glacier-park-sm.png differ
diff --git a/assets/img/blog/identity-theft.png b/assets/img/blog/identity-theft.png
index d86296313..b126b48ac 100644
Binary files a/assets/img/blog/identity-theft.png and b/assets/img/blog/identity-theft.png differ
diff --git a/assets/img/blog/uswds.png b/assets/img/blog/uswds.png
index e290a2c6a..934c11104 100644
Binary files a/assets/img/blog/uswds.png and b/assets/img/blog/uswds.png differ
diff --git a/assets/img/global/close.png b/assets/img/global/close.png
index 8388fd5f9..02e52a302 100644
Binary files a/assets/img/global/close.png and b/assets/img/global/close.png differ
diff --git a/assets/img/global/minus-alt.png b/assets/img/global/minus-alt.png
index 9f61f0c82..b271eabb2 100644
Binary files a/assets/img/global/minus-alt.png and b/assets/img/global/minus-alt.png differ
diff --git a/assets/img/global/plus-alt.png b/assets/img/global/plus-alt.png
index 3bc9af15a..4ee11782e 100644
Binary files a/assets/img/global/plus-alt.png and b/assets/img/global/plus-alt.png differ
diff --git a/assets/img/global/rss-hover.png b/assets/img/global/rss-hover.png
index a44bf74a0..e03e76bb8 100644
Binary files a/assets/img/global/rss-hover.png and b/assets/img/global/rss-hover.png differ
diff --git a/assets/img/global/rss.png b/assets/img/global/rss.png
index 70a482b8f..2b317faeb 100644
Binary files a/assets/img/global/rss.png and b/assets/img/global/rss.png differ
diff --git a/assets/img/global/search-dark.png b/assets/img/global/search-dark.png
index 8bf97b6e6..262bdb57a 100755
Binary files a/assets/img/global/search-dark.png and b/assets/img/global/search-dark.png differ
diff --git a/assets/img/global/social-icons/envelope-hover.png b/assets/img/global/social-icons/envelope-hover.png
index 84447abf1..20ce3b05a 100644
Binary files a/assets/img/global/social-icons/envelope-hover.png and b/assets/img/global/social-icons/envelope-hover.png differ
diff --git a/assets/img/global/social-icons/envelope.png b/assets/img/global/social-icons/envelope.png
index a9923fa70..04e8c8795 100644
Binary files a/assets/img/global/social-icons/envelope.png and b/assets/img/global/social-icons/envelope.png differ
diff --git a/assets/img/global/social-icons/rss-hover.png b/assets/img/global/social-icons/rss-hover.png
index 31691ae9f..d3dcfc89d 100644
Binary files a/assets/img/global/social-icons/rss-hover.png and b/assets/img/global/social-icons/rss-hover.png differ
diff --git a/assets/img/global/social-icons/rss.png b/assets/img/global/social-icons/rss.png
index 7054ece0e..a1dcf6d8c 100644
Binary files a/assets/img/global/social-icons/rss.png and b/assets/img/global/social-icons/rss.png differ
diff --git a/assets/img/global/social-icons/twitter-hover.png b/assets/img/global/social-icons/twitter-hover.png
index bfbe65f63..c4597c493 100644
Binary files a/assets/img/global/social-icons/twitter-hover.png and b/assets/img/global/social-icons/twitter-hover.png differ
diff --git a/assets/img/global/social-icons/twitter.png b/assets/img/global/social-icons/twitter.png
index 2b0ec2e5c..0d9fa71f2 100644
Binary files a/assets/img/global/social-icons/twitter.png and b/assets/img/global/social-icons/twitter.png differ
diff --git a/assets/img/global/usa-flag.png b/assets/img/global/usa-flag.png
old mode 100755
new mode 100644
index ae16c78c3..c38c2852f
Binary files a/assets/img/global/usa-flag.png and b/assets/img/global/usa-flag.png differ
diff --git a/assets/img/home/hero-ekiap.jpg b/assets/img/home/hero-ekiap.jpg
new file mode 100644
index 000000000..3d256509a
Binary files /dev/null and b/assets/img/home/hero-ekiap.jpg differ
diff --git a/assets/img/home/hero-ekiap.png b/assets/img/home/hero-ekiap.png
deleted file mode 100644
index 6abf9aaae..000000000
Binary files a/assets/img/home/hero-ekiap.png and /dev/null differ
diff --git a/assets/img/home/hero-every-kid.jpg b/assets/img/home/hero-every-kid.jpg
new file mode 100644
index 000000000..0ef49b571
Binary files /dev/null and b/assets/img/home/hero-every-kid.jpg differ
diff --git a/assets/img/home/hero-every-kid.png b/assets/img/home/hero-every-kid.png
deleted file mode 100644
index 88451bdb0..000000000
Binary files a/assets/img/home/hero-every-kid.png and /dev/null differ
diff --git a/assets/img/home/hero-immigration.jpg b/assets/img/home/hero-immigration.jpg
new file mode 100644
index 000000000..741ecdd45
Binary files /dev/null and b/assets/img/home/hero-immigration.jpg differ
diff --git a/assets/img/home/hero-immigration.png b/assets/img/home/hero-immigration.png
deleted file mode 100644
index e56fef657..000000000
Binary files a/assets/img/home/hero-immigration.png and /dev/null differ
diff --git a/assets/img/page-feature/join.jpg b/assets/img/page-feature/join.jpg
index cdd14134a..719e6b025 100644
Binary files a/assets/img/page-feature/join.jpg and b/assets/img/page-feature/join.jpg differ
diff --git a/assets/img/projects/hero_stateandlocal.jpg b/assets/img/projects/hero_stateandlocal.jpg
new file mode 100644
index 000000000..89f35c295
Binary files /dev/null and b/assets/img/projects/hero_stateandlocal.jpg differ
diff --git a/assets/img/projects/hero_stateandlocal.png b/assets/img/projects/hero_stateandlocal.png
deleted file mode 100644
index 57b88bacf..000000000
Binary files a/assets/img/projects/hero_stateandlocal.png and /dev/null differ
diff --git a/assets/img/social-icons/png/facebook25.png b/assets/img/social-icons/png/facebook25.png
index 65df5b940..98d556985 100644
Binary files a/assets/img/social-icons/png/facebook25.png and b/assets/img/social-icons/png/facebook25.png differ
diff --git a/assets/img/social-icons/png/rss25.png b/assets/img/social-icons/png/rss25.png
index 1ef7dcfbe..ee20edfb4 100644
Binary files a/assets/img/social-icons/png/rss25.png and b/assets/img/social-icons/png/rss25.png differ
diff --git a/assets/img/social-icons/png/twitter16.png b/assets/img/social-icons/png/twitter16.png
index 8668da4dc..f169313e5 100644
Binary files a/assets/img/social-icons/png/twitter16.png and b/assets/img/social-icons/png/twitter16.png differ
diff --git a/assets/img/social-icons/png/youtube15.png b/assets/img/social-icons/png/youtube15.png
index b0568137d..282219cca 100644
Binary files a/assets/img/social-icons/png/youtube15.png and b/assets/img/social-icons/png/youtube15.png differ
diff --git a/assets/img/team/aaron.jpg b/assets/img/team/aaron.jpg
index fa589721a..71d7c622a 100644
Binary files a/assets/img/team/aaron.jpg and b/assets/img/team/aaron.jpg differ
diff --git a/assets/img/team/ada-lovelace.jpg b/assets/img/team/ada-lovelace.jpg
index cd1461b9e..b238f8879 100644
Binary files a/assets/img/team/ada-lovelace.jpg and b/assets/img/team/ada-lovelace.jpg differ
diff --git a/assets/img/team/adam-kendall.jpg b/assets/img/team/adam-kendall.jpg
index 1dd4043f2..5e92a38c4 100644
Binary files a/assets/img/team/adam-kendall.jpg and b/assets/img/team/adam-kendall.jpg differ
diff --git a/assets/img/team/adrian-webb.jpg b/assets/img/team/adrian-webb.jpg
index 4d8683e4d..fc6c3582b 100644
Binary files a/assets/img/team/adrian-webb.jpg and b/assets/img/team/adrian-webb.jpg differ
diff --git a/assets/img/team/afeld.jpg b/assets/img/team/afeld.jpg
index 0cb0f63cf..8b72f39ab 100644
Binary files a/assets/img/team/afeld.jpg and b/assets/img/team/afeld.jpg differ
diff --git a/assets/img/team/alan-atlas.jpg b/assets/img/team/alan-atlas.jpg
index e3e7c1331..a1b8f0080 100644
Binary files a/assets/img/team/alan-atlas.jpg and b/assets/img/team/alan-atlas.jpg differ
diff --git a/assets/img/team/alan-turing.jpg b/assets/img/team/alan-turing.jpg
index bae2a76c4..4f54515a5 100644
Binary files a/assets/img/team/alan-turing.jpg and b/assets/img/team/alan-turing.jpg differ
diff --git a/assets/img/team/alex-bisker.jpg b/assets/img/team/alex-bisker.jpg
index ee32ada72..21a83ae24 100644
Binary files a/assets/img/team/alex-bisker.jpg and b/assets/img/team/alex-bisker.jpg differ
diff --git a/assets/img/team/alexander-hamilton.jpg b/assets/img/team/alexander-hamilton.jpg
index e867fa46f..0ea078c87 100644
Binary files a/assets/img/team/alexander-hamilton.jpg and b/assets/img/team/alexander-hamilton.jpg differ
diff --git a/assets/img/team/alison.jpg b/assets/img/team/alison.jpg
index ce4d40340..629da4631 100644
Binary files a/assets/img/team/alison.jpg and b/assets/img/team/alison.jpg differ
diff --git a/assets/img/team/alla.jpg b/assets/img/team/alla.jpg
index 065df0c92..610056bb2 100644
Binary files a/assets/img/team/alla.jpg and b/assets/img/team/alla.jpg differ
diff --git a/assets/img/team/amanda-robinson.jpg b/assets/img/team/amanda-robinson.jpg
index 653051dc8..dd682cba3 100644
Binary files a/assets/img/team/amanda-robinson.jpg and b/assets/img/team/amanda-robinson.jpg differ
diff --git a/assets/img/team/amanda-schonfeld.jpg b/assets/img/team/amanda-schonfeld.jpg
index 976a2ab05..5c82a165b 100644
Binary files a/assets/img/team/amanda-schonfeld.jpg and b/assets/img/team/amanda-schonfeld.jpg differ
diff --git a/assets/img/team/amber.jpg b/assets/img/team/amber.jpg
index 8101f44c4..b6d997fe5 100644
Binary files a/assets/img/team/amber.jpg and b/assets/img/team/amber.jpg differ
diff --git a/assets/img/team/amos.jpg b/assets/img/team/amos.jpg
index 27766e346..52e95a18c 100644
Binary files a/assets/img/team/amos.jpg and b/assets/img/team/amos.jpg differ
diff --git a/assets/img/team/andre.jpg b/assets/img/team/andre.jpg
index 5f6180331..2f0de5f0f 100644
Binary files a/assets/img/team/andre.jpg and b/assets/img/team/andre.jpg differ
diff --git a/assets/img/team/andrew.jpg b/assets/img/team/andrew.jpg
index d4dfdb8d5..895b0594e 100644
Binary files a/assets/img/team/andrew.jpg and b/assets/img/team/andrew.jpg differ
diff --git a/assets/img/team/andrewmaier.jpg b/assets/img/team/andrewmaier.jpg
index 0b49446cb..0fa85e48e 100644
Binary files a/assets/img/team/andrewmaier.jpg and b/assets/img/team/andrewmaier.jpg differ
diff --git a/assets/img/team/angela-colter.jpg b/assets/img/team/angela-colter.jpg
index a61955c41..b00e0d5e4 100644
Binary files a/assets/img/team/angela-colter.jpg and b/assets/img/team/angela-colter.jpg differ
diff --git a/assets/img/team/anna.jpg b/assets/img/team/anna.jpg
index f34c14e19..555b34266 100644
Binary files a/assets/img/team/anna.jpg and b/assets/img/team/anna.jpg differ
diff --git a/assets/img/team/annalee.jpg b/assets/img/team/annalee.jpg
index c39046f25..2b8934e80 100644
Binary files a/assets/img/team/annalee.jpg and b/assets/img/team/annalee.jpg differ
diff --git a/assets/img/team/bateman.jpg b/assets/img/team/bateman.jpg
index c57aef039..39a692058 100644
Binary files a/assets/img/team/bateman.jpg and b/assets/img/team/bateman.jpg differ
diff --git a/assets/img/team/becky.jpg b/assets/img/team/becky.jpg
index 35ff65df0..d961032e7 100644
Binary files a/assets/img/team/becky.jpg and b/assets/img/team/becky.jpg differ
diff --git a/assets/img/team/ben.jpg b/assets/img/team/ben.jpg
index 0a33e2481..5b58ba6f2 100644
Binary files a/assets/img/team/ben.jpg and b/assets/img/team/ben.jpg differ
diff --git a/assets/img/team/bernd.jpg b/assets/img/team/bernd.jpg
index 7e001a2db..ac018490a 100644
Binary files a/assets/img/team/bernd.jpg and b/assets/img/team/bernd.jpg differ
diff --git a/assets/img/team/betsy-ross.jpg b/assets/img/team/betsy-ross.jpg
index c3dd08f5c..f03a2e70f 100644
Binary files a/assets/img/team/betsy-ross.jpg and b/assets/img/team/betsy-ross.jpg differ
diff --git a/assets/img/team/bill.jpg b/assets/img/team/bill.jpg
index b04257b7b..b7409c1ff 100644
Binary files a/assets/img/team/bill.jpg and b/assets/img/team/bill.jpg differ
diff --git a/assets/img/team/blacktm.jpg b/assets/img/team/blacktm.jpg
index e5a6c15fb..b1c45fa86 100644
Binary files a/assets/img/team/blacktm.jpg and b/assets/img/team/blacktm.jpg differ
diff --git a/assets/img/team/boone.jpg b/assets/img/team/boone.jpg
index d51663869..3710987e8 100644
Binary files a/assets/img/team/boone.jpg and b/assets/img/team/boone.jpg differ
diff --git a/assets/img/team/bradnunnally.jpg b/assets/img/team/bradnunnally.jpg
index 23c4f3061..354d007f3 100644
Binary files a/assets/img/team/bradnunnally.jpg and b/assets/img/team/bradnunnally.jpg differ
diff --git a/assets/img/team/brendan.jpg b/assets/img/team/brendan.jpg
index 6a4b4a789..a5f3da0b5 100644
Binary files a/assets/img/team/brendan.jpg and b/assets/img/team/brendan.jpg differ
diff --git a/assets/img/team/bret.jpg b/assets/img/team/bret.jpg
index f09caf493..760523dc4 100644
Binary files a/assets/img/team/bret.jpg and b/assets/img/team/bret.jpg differ
diff --git a/assets/img/team/brethauer.jpg b/assets/img/team/brethauer.jpg
index 3e95a245a..33daadb9b 100755
Binary files a/assets/img/team/brethauer.jpg and b/assets/img/team/brethauer.jpg differ
diff --git a/assets/img/team/brian.jpg b/assets/img/team/brian.jpg
index 06cfa8b2a..4126d38de 100644
Binary files a/assets/img/team/brian.jpg and b/assets/img/team/brian.jpg differ
diff --git a/assets/img/team/britta-gustafson.jpg b/assets/img/team/britta-gustafson.jpg
index eaa47c494..4a6680a75 100644
Binary files a/assets/img/team/britta-gustafson.jpg and b/assets/img/team/britta-gustafson.jpg differ
diff --git a/assets/img/team/captain-america.jpg b/assets/img/team/captain-america.jpg
index 1bb9386b8..4c7151a83 100644
Binary files a/assets/img/team/captain-america.jpg and b/assets/img/team/captain-america.jpg differ
diff --git a/assets/img/team/carlo-costino.jpg b/assets/img/team/carlo-costino.jpg
index eed5dc8de..c31b92280 100644
Binary files a/assets/img/team/carlo-costino.jpg and b/assets/img/team/carlo-costino.jpg differ
diff --git a/assets/img/team/carolyn.jpg b/assets/img/team/carolyn.jpg
index b5a564714..327231113 100644
Binary files a/assets/img/team/carolyn.jpg and b/assets/img/team/carolyn.jpg differ
diff --git a/assets/img/team/catherine.jpg b/assets/img/team/catherine.jpg
index 6c9174b81..1445ef85b 100644
Binary files a/assets/img/team/catherine.jpg and b/assets/img/team/catherine.jpg differ
diff --git a/assets/img/team/chrisc.jpg b/assets/img/team/chrisc.jpg
index 313a60a80..02e6fe1b1 100644
Binary files a/assets/img/team/chrisc.jpg and b/assets/img/team/chrisc.jpg differ
diff --git a/assets/img/team/christine.jpg b/assets/img/team/christine.jpg
index 25a10be14..2719fb96e 100644
Binary files a/assets/img/team/christine.jpg and b/assets/img/team/christine.jpg differ
diff --git a/assets/img/team/christopher-goranson.jpg b/assets/img/team/christopher-goranson.jpg
index f19d1527a..992d19065 100644
Binary files a/assets/img/team/christopher-goranson.jpg and b/assets/img/team/christopher-goranson.jpg differ
diff --git a/assets/img/team/clinton-troxel.jpg b/assets/img/team/clinton-troxel.jpg
index 6390b99d3..495fa4681 100755
Binary files a/assets/img/team/clinton-troxel.jpg and b/assets/img/team/clinton-troxel.jpg differ
diff --git a/assets/img/team/cm.jpg b/assets/img/team/cm.jpg
index cacfb00f6..54049d308 100644
Binary files a/assets/img/team/cm.jpg and b/assets/img/team/cm.jpg differ
diff --git a/assets/img/team/colinmacarthur.jpg b/assets/img/team/colinmacarthur.jpg
index bba65831c..c73843f6e 100644
Binary files a/assets/img/team/colinmacarthur.jpg and b/assets/img/team/colinmacarthur.jpg differ
diff --git a/assets/img/team/cristina.jpg b/assets/img/team/cristina.jpg
index 2196ea210..5ce20c0a8 100644
Binary files a/assets/img/team/cristina.jpg and b/assets/img/team/cristina.jpg differ
diff --git a/assets/img/team/dave.jpg b/assets/img/team/dave.jpg
index db3500d11..6dda50cc5 100644
Binary files a/assets/img/team/dave.jpg and b/assets/img/team/dave.jpg differ
diff --git a/assets/img/team/david.jpg b/assets/img/team/david.jpg
index dce905572..673a33bf8 100644
Binary files a/assets/img/team/david.jpg and b/assets/img/team/david.jpg differ
diff --git a/assets/img/team/dhcole.jpg b/assets/img/team/dhcole.jpg
index d05b43537..881874e23 100644
Binary files a/assets/img/team/dhcole.jpg and b/assets/img/team/dhcole.jpg differ
diff --git a/assets/img/team/diego.jpg b/assets/img/team/diego.jpg
index d376ae838..3ade8e7b2 100644
Binary files a/assets/img/team/diego.jpg and b/assets/img/team/diego.jpg differ
diff --git a/assets/img/team/dmayercantu.jpg b/assets/img/team/dmayercantu.jpg
index c4d426bcc..54ff8c41c 100644
Binary files a/assets/img/team/dmayercantu.jpg and b/assets/img/team/dmayercantu.jpg differ
diff --git a/assets/img/team/duane-rollins.jpg b/assets/img/team/duane-rollins.jpg
index 3260433aa..09fe0e8fe 100644
Binary files a/assets/img/team/duane-rollins.jpg and b/assets/img/team/duane-rollins.jpg differ
diff --git a/assets/img/team/ed-mullen.jpg b/assets/img/team/ed-mullen.jpg
index 1e3c59608..faaa1b7d4 100644
Binary files a/assets/img/team/ed-mullen.jpg and b/assets/img/team/ed-mullen.jpg differ
diff --git a/assets/img/team/egoodman.jpg b/assets/img/team/egoodman.jpg
index ac4808b0a..d3c7e894c 100644
Binary files a/assets/img/team/egoodman.jpg and b/assets/img/team/egoodman.jpg differ
diff --git a/assets/img/team/elaine.jpg b/assets/img/team/elaine.jpg
index 60371bf0f..97f1999eb 100644
Binary files a/assets/img/team/elaine.jpg and b/assets/img/team/elaine.jpg differ
diff --git a/assets/img/team/emileigh.jpg b/assets/img/team/emileigh.jpg
index 81e6f2277..75e879b8d 100644
Binary files a/assets/img/team/emileigh.jpg and b/assets/img/team/emileigh.jpg differ
diff --git a/assets/img/team/eric.jpg b/assets/img/team/eric.jpg
index 75c7419b6..376417804 100644
Binary files a/assets/img/team/eric.jpg and b/assets/img/team/eric.jpg differ
diff --git a/assets/img/team/erica.jpg b/assets/img/team/erica.jpg
index f0a34f9cf..99f8a393f 100644
Binary files a/assets/img/team/erica.jpg and b/assets/img/team/erica.jpg differ
diff --git a/assets/img/team/ericronne.jpg b/assets/img/team/ericronne.jpg
index f244ff81f..41fdf6c1c 100644
Binary files a/assets/img/team/ericronne.jpg and b/assets/img/team/ericronne.jpg differ
diff --git a/assets/img/team/estherchang.jpg b/assets/img/team/estherchang.jpg
index 679fcd1fe..9ccf03aad 100644
Binary files a/assets/img/team/estherchang.jpg and b/assets/img/team/estherchang.jpg differ
diff --git a/assets/img/team/fureigh.jpg b/assets/img/team/fureigh.jpg
index 9730c6006..f3f75f5d8 100644
Binary files a/assets/img/team/fureigh.jpg and b/assets/img/team/fureigh.jpg differ
diff --git a/assets/img/team/gail.jpg b/assets/img/team/gail.jpg
index d6039cd9b..a29769672 100644
Binary files a/assets/img/team/gail.jpg and b/assets/img/team/gail.jpg differ
diff --git a/assets/img/team/garren.jpg b/assets/img/team/garren.jpg
index 401a7a18b..169b69956 100644
Binary files a/assets/img/team/garren.jpg and b/assets/img/team/garren.jpg differ
diff --git a/assets/img/team/gitter.jpg b/assets/img/team/gitter.jpg
index c512b2808..1b3968646 100644
Binary files a/assets/img/team/gitter.jpg and b/assets/img/team/gitter.jpg differ
diff --git a/assets/img/team/grace-hopper.jpg b/assets/img/team/grace-hopper.jpg
index e8fd30040..2b0917357 100644
Binary files a/assets/img/team/grace-hopper.jpg and b/assets/img/team/grace-hopper.jpg differ
diff --git a/assets/img/team/gramirez.jpg b/assets/img/team/gramirez.jpg
index 4c9124c11..03e1fe71f 100644
Binary files a/assets/img/team/gramirez.jpg and b/assets/img/team/gramirez.jpg differ
diff --git a/assets/img/team/gray.jpg b/assets/img/team/gray.jpg
index c2f4a08e7..fc92fbcc0 100644
Binary files a/assets/img/team/gray.jpg and b/assets/img/team/gray.jpg differ
diff --git a/assets/img/team/hillary.jpg b/assets/img/team/hillary.jpg
index 640d0181e..1bf48e2ba 100644
Binary files a/assets/img/team/hillary.jpg and b/assets/img/team/hillary.jpg differ
diff --git a/assets/img/team/holly.jpg b/assets/img/team/holly.jpg
index 027720ea8..cf30713fa 100644
Binary files a/assets/img/team/holly.jpg and b/assets/img/team/holly.jpg differ
diff --git a/assets/img/team/jacobharris.jpg b/assets/img/team/jacobharris.jpg
index b0c05a823..db53b02d0 100644
Binary files a/assets/img/team/jacobharris.jpg and b/assets/img/team/jacobharris.jpg differ
diff --git a/assets/img/team/jameshupp.jpg b/assets/img/team/jameshupp.jpg
index d6b3c3c6f..395030e49 100644
Binary files a/assets/img/team/jameshupp.jpg and b/assets/img/team/jameshupp.jpg differ
diff --git a/assets/img/team/jamesscott.jpg b/assets/img/team/jamesscott.jpg
index 459ba0623..4c8379ba3 100644
Binary files a/assets/img/team/jamesscott.jpg and b/assets/img/team/jamesscott.jpg differ
diff --git a/assets/img/team/jamie.jpg b/assets/img/team/jamie.jpg
index e841538ea..930057fdb 100644
Binary files a/assets/img/team/jamie.jpg and b/assets/img/team/jamie.jpg differ
diff --git a/assets/img/team/jayhuie.jpg b/assets/img/team/jayhuie.jpg
index 347a75e83..5e0b06ebe 100644
Binary files a/assets/img/team/jayhuie.jpg and b/assets/img/team/jayhuie.jpg differ
diff --git a/assets/img/team/jen.jpg b/assets/img/team/jen.jpg
index cc22ca367..fd6899cec 100644
Binary files a/assets/img/team/jen.jpg and b/assets/img/team/jen.jpg differ
diff --git a/assets/img/team/jennmoran.jpg b/assets/img/team/jennmoran.jpg
index f2c6ed74d..0739ab55a 100644
Binary files a/assets/img/team/jennmoran.jpg and b/assets/img/team/jennmoran.jpg differ
diff --git a/assets/img/team/jentress.jpg b/assets/img/team/jentress.jpg
index 73a1da3a1..9627d277c 100644
Binary files a/assets/img/team/jentress.jpg and b/assets/img/team/jentress.jpg differ
diff --git a/assets/img/team/jeremiak.jpg b/assets/img/team/jeremiak.jpg
index 4fdf1547e..702c4be3f 100644
Binary files a/assets/img/team/jeremiak.jpg and b/assets/img/team/jeremiak.jpg differ
diff --git a/assets/img/team/jeremy.jpg b/assets/img/team/jeremy.jpg
index 8fc71dd56..407f0e30d 100644
Binary files a/assets/img/team/jeremy.jpg and b/assets/img/team/jeremy.jpg differ
diff --git a/assets/img/team/jessedondero.jpg b/assets/img/team/jessedondero.jpg
index 80d591c18..ff2a9f535 100644
Binary files a/assets/img/team/jessedondero.jpg and b/assets/img/team/jessedondero.jpg differ
diff --git a/assets/img/team/jessie-posilkin.jpg b/assets/img/team/jessie-posilkin.jpg
index 8622eb0b9..1c51fd0d9 100644
Binary files a/assets/img/team/jessie-posilkin.jpg and b/assets/img/team/jessie-posilkin.jpg differ
diff --git a/assets/img/team/jessie.jpg b/assets/img/team/jessie.jpg
index 9fc0b1127..615d9c6a6 100644
Binary files a/assets/img/team/jessie.jpg and b/assets/img/team/jessie.jpg differ
diff --git a/assets/img/team/jez-humble.jpg b/assets/img/team/jez-humble.jpg
index bdba16eb1..c30a563f9 100644
Binary files a/assets/img/team/jez-humble.jpg and b/assets/img/team/jez-humble.jpg differ
diff --git a/assets/img/team/jhunter.jpg b/assets/img/team/jhunter.jpg
index d0de5a1e3..32e47b0c2 100644
Binary files a/assets/img/team/jhunter.jpg and b/assets/img/team/jhunter.jpg differ
diff --git a/assets/img/team/john-donmoyer.jpg b/assets/img/team/john-donmoyer.jpg
index a6bfb65bd..297debabf 100644
Binary files a/assets/img/team/john-donmoyer.jpg and b/assets/img/team/john-donmoyer.jpg differ
diff --git a/assets/img/team/josh.jpg b/assets/img/team/josh.jpg
index 279c31200..7f9e932e3 100644
Binary files a/assets/img/team/josh.jpg and b/assets/img/team/josh.jpg differ
diff --git a/assets/img/team/joshbailes.jpg b/assets/img/team/joshbailes.jpg
index 25bf3ccd9..61f3ffe2b 100644
Binary files a/assets/img/team/joshbailes.jpg and b/assets/img/team/joshbailes.jpg differ
diff --git a/assets/img/team/joshcarp.jpg b/assets/img/team/joshcarp.jpg
index 61387e6c6..c74c23518 100644
Binary files a/assets/img/team/joshcarp.jpg and b/assets/img/team/joshcarp.jpg differ
diff --git a/assets/img/team/jtag.jpg b/assets/img/team/jtag.jpg
index d1820ca24..a9ec2a829 100644
Binary files a/assets/img/team/jtag.jpg and b/assets/img/team/jtag.jpg differ
diff --git a/assets/img/team/jthibault.jpg b/assets/img/team/jthibault.jpg
index de4a2889b..9bca01ca3 100644
Binary files a/assets/img/team/jthibault.jpg and b/assets/img/team/jthibault.jpg differ
diff --git a/assets/img/team/julia-winn.jpg b/assets/img/team/julia-winn.jpg
index e231f70eb..c915dff07 100644
Binary files a/assets/img/team/julia-winn.jpg and b/assets/img/team/julia-winn.jpg differ
diff --git a/assets/img/team/julia.jpg b/assets/img/team/julia.jpg
index 8e145cb96..d2d122ccb 100644
Binary files a/assets/img/team/julia.jpg and b/assets/img/team/julia.jpg differ
diff --git a/assets/img/team/justin.jpg b/assets/img/team/justin.jpg
index 590500043..ddb0080c5 100644
Binary files a/assets/img/team/justin.jpg and b/assets/img/team/justin.jpg differ
diff --git a/assets/img/team/kaitlin.jpg b/assets/img/team/kaitlin.jpg
index e5ada4f26..c4f99a758 100644
Binary files a/assets/img/team/kaitlin.jpg and b/assets/img/team/kaitlin.jpg differ
diff --git a/assets/img/team/kane.jpg b/assets/img/team/kane.jpg
index 32aa82b2e..226bfa59d 100644
Binary files a/assets/img/team/kane.jpg and b/assets/img/team/kane.jpg differ
diff --git a/assets/img/team/kara.jpg b/assets/img/team/kara.jpg
index c21e9d5eb..9dbdcb350 100644
Binary files a/assets/img/team/kara.jpg and b/assets/img/team/kara.jpg differ
diff --git a/assets/img/team/kate.jpg b/assets/img/team/kate.jpg
index ae338d5a3..2616c9faf 100644
Binary files a/assets/img/team/kate.jpg and b/assets/img/team/kate.jpg differ
diff --git a/assets/img/team/kathrynconnolly.jpg b/assets/img/team/kathrynconnolly.jpg
index 6831fc650..37feadb18 100644
Binary files a/assets/img/team/kathrynconnolly.jpg and b/assets/img/team/kathrynconnolly.jpg differ
diff --git a/assets/img/team/kedelman.jpg b/assets/img/team/kedelman.jpg
index ee5a598c4..1537d85d2 100644
Binary files a/assets/img/team/kedelman.jpg and b/assets/img/team/kedelman.jpg differ
diff --git a/assets/img/team/khandelwal.jpg b/assets/img/team/khandelwal.jpg
index a6fb33228..ea4d6836c 100644
Binary files a/assets/img/team/khandelwal.jpg and b/assets/img/team/khandelwal.jpg differ
diff --git a/assets/img/team/kimberdowsett.jpg b/assets/img/team/kimberdowsett.jpg
index 1205be326..117d3e03e 100644
Binary files a/assets/img/team/kimberdowsett.jpg and b/assets/img/team/kimberdowsett.jpg differ
diff --git a/assets/img/team/krutivora.jpg b/assets/img/team/krutivora.jpg
index 967df78a8..4eacdc535 100644
Binary files a/assets/img/team/krutivora.jpg and b/assets/img/team/krutivora.jpg differ
diff --git a/assets/img/team/larry-bafundo.jpg b/assets/img/team/larry-bafundo.jpg
index 14312de44..d07999341 100644
Binary files a/assets/img/team/larry-bafundo.jpg and b/assets/img/team/larry-bafundo.jpg differ
diff --git a/assets/img/team/leah.jpg b/assets/img/team/leah.jpg
index b2856e121..73ff5bb1a 100644
Binary files a/assets/img/team/leah.jpg and b/assets/img/team/leah.jpg differ
diff --git a/assets/img/team/leahg.jpg b/assets/img/team/leahg.jpg
index 486309855..184f65480 100644
Binary files a/assets/img/team/leahg.jpg and b/assets/img/team/leahg.jpg differ
diff --git a/assets/img/team/lena.jpg b/assets/img/team/lena.jpg
index d580e320b..5721b872c 100644
Binary files a/assets/img/team/lena.jpg and b/assets/img/team/lena.jpg differ
diff --git a/assets/img/team/lenny-bogdonoff.jpg b/assets/img/team/lenny-bogdonoff.jpg
index 94ed42c78..d693f445c 100644
Binary files a/assets/img/team/lenny-bogdonoff.jpg and b/assets/img/team/lenny-bogdonoff.jpg differ
diff --git a/assets/img/team/lindsay.jpg b/assets/img/team/lindsay.jpg
index cc3305037..f5a8cb611 100644
Binary files a/assets/img/team/lindsay.jpg and b/assets/img/team/lindsay.jpg differ
diff --git a/assets/img/team/manger.jpg b/assets/img/team/manger.jpg
index 5bcb63ce8..69d78c3ef 100644
Binary files a/assets/img/team/manger.jpg and b/assets/img/team/manger.jpg differ
diff --git a/assets/img/team/marco.jpg b/assets/img/team/marco.jpg
index 89810d154..08eb0e748 100644
Binary files a/assets/img/team/marco.jpg and b/assets/img/team/marco.jpg differ
diff --git a/assets/img/team/mark-hopson.jpg b/assets/img/team/mark-hopson.jpg
index f072e51ab..7b24d891c 100644
Binary files a/assets/img/team/mark-hopson.jpg and b/assets/img/team/mark-hopson.jpg differ
diff --git a/assets/img/team/mark-trammell.jpg b/assets/img/team/mark-trammell.jpg
index c53b15b8a..751bb86d2 100644
Binary files a/assets/img/team/mark-trammell.jpg and b/assets/img/team/mark-trammell.jpg differ
diff --git a/assets/img/team/matt.jpg b/assets/img/team/matt.jpg
index 9346d057c..ff02025b2 100644
Binary files a/assets/img/team/matt.jpg and b/assets/img/team/matt.jpg differ
diff --git a/assets/img/team/maya.jpg b/assets/img/team/maya.jpg
index 00cc76efc..c37986107 100644
Binary files a/assets/img/team/maya.jpg and b/assets/img/team/maya.jpg differ
diff --git a/assets/img/team/meghana.jpg b/assets/img/team/meghana.jpg
index cb32cf20f..1d8dd6164 100644
Binary files a/assets/img/team/meghana.jpg and b/assets/img/team/meghana.jpg differ
diff --git a/assets/img/team/melody.jpg b/assets/img/team/melody.jpg
index ed457f9b7..36592f40d 100644
Binary files a/assets/img/team/melody.jpg and b/assets/img/team/melody.jpg differ
diff --git a/assets/img/team/mhz.jpg b/assets/img/team/mhz.jpg
index 9ac9c14a3..43d3d4a40 100644
Binary files a/assets/img/team/mhz.jpg and b/assets/img/team/mhz.jpg differ
diff --git a/assets/img/team/micahsaul.jpg b/assets/img/team/micahsaul.jpg
index 853e21d2a..892f960a1 100644
Binary files a/assets/img/team/micahsaul.jpg and b/assets/img/team/micahsaul.jpg differ
diff --git a/assets/img/team/michael-balint.jpg b/assets/img/team/michael-balint.jpg
index eea214586..2098c4f46 100644
Binary files a/assets/img/team/michael-balint.jpg and b/assets/img/team/michael-balint.jpg differ
diff --git a/assets/img/team/michael-cata.jpg b/assets/img/team/michael-cata.jpg
index 0a804ce76..849604511 100644
Binary files a/assets/img/team/michael-cata.jpg and b/assets/img/team/michael-cata.jpg differ
diff --git a/assets/img/team/michael-torres.jpg b/assets/img/team/michael-torres.jpg
index a38a00c7f..6a4261b77 100644
Binary files a/assets/img/team/michael-torres.jpg and b/assets/img/team/michael-torres.jpg differ
diff --git a/assets/img/team/mike-hsu.jpg b/assets/img/team/mike-hsu.jpg
index b6a05c7c8..5625d7eaa 100644
Binary files a/assets/img/team/mike-hsu.jpg and b/assets/img/team/mike-hsu.jpg differ
diff --git a/assets/img/team/moncef.jpg b/assets/img/team/moncef.jpg
index c71f2abb8..d363fc131 100644
Binary files a/assets/img/team/moncef.jpg and b/assets/img/team/moncef.jpg differ
diff --git a/assets/img/team/mossadeq-zia.jpg b/assets/img/team/mossadeq-zia.jpg
index 399aac03f..a5981bcee 100644
Binary files a/assets/img/team/mossadeq-zia.jpg and b/assets/img/team/mossadeq-zia.jpg differ
diff --git a/assets/img/team/muerdter.jpeg b/assets/img/team/muerdter.jpeg
index 49aaec6b8..66be6304d 100644
Binary files a/assets/img/team/muerdter.jpeg and b/assets/img/team/muerdter.jpeg differ
diff --git a/assets/img/team/nick.jpg b/assets/img/team/nick.jpg
index 126c0fb12..df3f0a4e7 100644
Binary files a/assets/img/team/nick.jpg and b/assets/img/team/nick.jpg differ
diff --git a/assets/img/team/nicole-fenton.jpg b/assets/img/team/nicole-fenton.jpg
index cd1389ac2..456a0ccdc 100644
Binary files a/assets/img/team/nicole-fenton.jpg and b/assets/img/team/nicole-fenton.jpg differ
diff --git a/assets/img/team/nienhuis.jpg b/assets/img/team/nienhuis.jpg
index 2c3e59d31..8d4905bca 100644
Binary files a/assets/img/team/nienhuis.jpg and b/assets/img/team/nienhuis.jpg differ
diff --git a/assets/img/team/noah.jpg b/assets/img/team/noah.jpg
index 267804620..64df3761d 100644
Binary files a/assets/img/team/noah.jpg and b/assets/img/team/noah.jpg differ
diff --git a/assets/img/team/ozzy.jpg b/assets/img/team/ozzy.jpg
index 2f658d33b..474002f8d 100644
Binary files a/assets/img/team/ozzy.jpg and b/assets/img/team/ozzy.jpg differ
diff --git a/assets/img/team/philip-reid.jpg b/assets/img/team/philip-reid.jpg
index d50df06ce..fba2c45b7 100644
Binary files a/assets/img/team/philip-reid.jpg and b/assets/img/team/philip-reid.jpg differ
diff --git a/assets/img/team/phoebe-espiritu.jpg b/assets/img/team/phoebe-espiritu.jpg
index 9cccd7b8b..65e697a00 100644
Binary files a/assets/img/team/phoebe-espiritu.jpg and b/assets/img/team/phoebe-espiritu.jpg differ
diff --git a/assets/img/team/pia.jpg b/assets/img/team/pia.jpg
index fa5877a13..949a89a3b 100644
Binary files a/assets/img/team/pia.jpg and b/assets/img/team/pia.jpg differ
diff --git a/assets/img/team/porta-antiporta.jpg b/assets/img/team/porta-antiporta.jpg
index 775bc274e..c5955bb57 100644
Binary files a/assets/img/team/porta-antiporta.jpg and b/assets/img/team/porta-antiporta.jpg differ
diff --git a/assets/img/team/randy-hart.jpg b/assets/img/team/randy-hart.jpg
index 03f41e2c7..3149432d7 100644
Binary files a/assets/img/team/randy-hart.jpg and b/assets/img/team/randy-hart.jpg differ
diff --git a/assets/img/team/raphy.jpg b/assets/img/team/raphy.jpg
index 0a42770a3..876176a7f 100644
Binary files a/assets/img/team/raphy.jpg and b/assets/img/team/raphy.jpg differ
diff --git a/assets/img/team/rebeccapiazza.jpg b/assets/img/team/rebeccapiazza.jpg
index 02a45cd80..54ab612b6 100644
Binary files a/assets/img/team/rebeccapiazza.jpg and b/assets/img/team/rebeccapiazza.jpg differ
diff --git a/assets/img/team/ric.jpg b/assets/img/team/ric.jpg
index 6407f454f..37691b181 100644
Binary files a/assets/img/team/ric.jpg and b/assets/img/team/ric.jpg differ
diff --git a/assets/img/team/robin-carnahan.jpg b/assets/img/team/robin-carnahan.jpg
index cf16e8ced..406bf3eef 100644
Binary files a/assets/img/team/robin-carnahan.jpg and b/assets/img/team/robin-carnahan.jpg differ
diff --git a/assets/img/team/romke.jpg b/assets/img/team/romke.jpg
index f04bcea8a..5a2fb4798 100644
Binary files a/assets/img/team/romke.jpg and b/assets/img/team/romke.jpg differ
diff --git a/assets/img/team/russ.jpg b/assets/img/team/russ.jpg
index 5a6f09734..c9d714acd 100644
Binary files a/assets/img/team/russ.jpg and b/assets/img/team/russ.jpg differ
diff --git a/assets/img/team/sally-ride.jpg b/assets/img/team/sally-ride.jpg
index 2771f4b29..cf70e3c30 100644
Binary files a/assets/img/team/sally-ride.jpg and b/assets/img/team/sally-ride.jpg differ
diff --git a/assets/img/team/sam-eagle.jpg b/assets/img/team/sam-eagle.jpg
index 0f743472f..d1a586efe 100644
Binary files a/assets/img/team/sam-eagle.jpg and b/assets/img/team/sam-eagle.jpg differ
diff --git a/assets/img/team/sarah.jpg b/assets/img/team/sarah.jpg
index 1c8763625..0a295dc40 100644
Binary files a/assets/img/team/sarah.jpg and b/assets/img/team/sarah.jpg differ
diff --git a/assets/img/team/sasha.jpg b/assets/img/team/sasha.jpg
index ffdd276b2..b25b21fd3 100644
Binary files a/assets/img/team/sasha.jpg and b/assets/img/team/sasha.jpg differ
diff --git a/assets/img/team/shawn.jpg b/assets/img/team/shawn.jpg
index 6b954094e..4235f32f8 100644
Binary files a/assets/img/team/shawn.jpg and b/assets/img/team/shawn.jpg differ
diff --git a/assets/img/team/shawnique.jpg b/assets/img/team/shawnique.jpg
index 617be63bd..634d4d8dc 100644
Binary files a/assets/img/team/shawnique.jpg and b/assets/img/team/shawnique.jpg differ
diff --git a/assets/img/team/stacy.jpg b/assets/img/team/stacy.jpg
index 4aee2af27..f5cbd11cc 100644
Binary files a/assets/img/team/stacy.jpg and b/assets/img/team/stacy.jpg differ
diff --git a/assets/img/team/stephanierivera.jpg b/assets/img/team/stephanierivera.jpg
index 37775c32b..8bceb8887 100644
Binary files a/assets/img/team/stephanierivera.jpg and b/assets/img/team/stephanierivera.jpg differ
diff --git a/assets/img/team/steven-reilly.jpg b/assets/img/team/steven-reilly.jpg
index 2b8806299..cf5a807e1 100644
Binary files a/assets/img/team/steven-reilly.jpg and b/assets/img/team/steven-reilly.jpg differ
diff --git a/assets/img/team/theresa.jpg b/assets/img/team/theresa.jpg
index d582b1b03..3f5f4109f 100644
Binary files a/assets/img/team/theresa.jpg and b/assets/img/team/theresa.jpg differ
diff --git a/assets/img/team/timothy-jones.jpg b/assets/img/team/timothy-jones.jpg
index 450aa60e1..9f625aabd 100644
Binary files a/assets/img/team/timothy-jones.jpg and b/assets/img/team/timothy-jones.jpg differ
diff --git a/assets/img/team/vdavez.jpg b/assets/img/team/vdavez.jpg
index 0135cddae..2b2299c19 100644
Binary files a/assets/img/team/vdavez.jpg and b/assets/img/team/vdavez.jpg differ
diff --git a/assets/img/team/victor.jpg b/assets/img/team/victor.jpg
index f5dd381d9..6a4248d5b 100644
Binary files a/assets/img/team/victor.jpg and b/assets/img/team/victor.jpg differ
diff --git a/assets/img/team/will.jpg b/assets/img/team/will.jpg
index 37fd5dfa6..930250d00 100644
Binary files a/assets/img/team/will.jpg and b/assets/img/team/will.jpg differ
diff --git a/assets/img/team/willsullivan.jpg b/assets/img/team/willsullivan.jpg
index 581ececd8..c1c80157f 100644
Binary files a/assets/img/team/willsullivan.jpg and b/assets/img/team/willsullivan.jpg differ
diff --git a/assets/img/team/yoz.jpg b/assets/img/team/yoz.jpg
index f238ea23f..881b43542 100644
Binary files a/assets/img/team/yoz.jpg and b/assets/img/team/yoz.jpg differ
diff --git a/assets/img/team/yuda.jpg b/assets/img/team/yuda.jpg
index d323f3586..17d7db1de 100644
Binary files a/assets/img/team/yuda.jpg and b/assets/img/team/yuda.jpg differ
diff --git a/assets/img/team/zaccohn.jpg b/assets/img/team/zaccohn.jpg
index e49f89188..8470ff52f 100644
Binary files a/assets/img/team/zaccohn.jpg and b/assets/img/team/zaccohn.jpg differ
diff --git a/circle.yml b/circle.yml
index c2336129c..ac51ba2a8 100644
--- a/circle.yml
+++ b/circle.yml
@@ -14,7 +14,7 @@ machine:
 dependencies:
   pre:
     - npm install -g accesslint-cli
-    - bundle install --binstubs
+    - bundle install
 
 test:
   override:
@@ -22,5 +22,5 @@ test:
     - npm run htmlproofer
     - bundle exec rspec
     - CODECLIMATE_REPO_TOKEN=${CODECLIMATE_REPO_TOKEN} bundle exec codeclimate-test-reporter
-  post:
-    - ./serve-accesslint && bundle exec accesslint-ci scan http://localhost:4000
+  # post:
+    # - ./serve-accesslint && bundle exec accesslint-ci scan http://localhost:4000/site
diff --git a/config_blog.rb b/config_blog.rb
index eed7e1aa1..56b01278e 100644
--- a/config_blog.rb
+++ b/config_blog.rb
@@ -1,6 +1,6 @@
-require 'pry'
-require 'rb-readline'
 # script to update the blog build config
+require 'yaml'
+
 posts = './_posts'
 post_directory = Dir[File.join(posts, '**', '*')]
 stripped_post_directory = post_directory.map do |post|
@@ -8,18 +8,19 @@
 end
 
 post_count = stripped_post_directory.count
-config_path = './_config-blog.yml'
-lines = File.readlines(config_path)
-acceptable_indices = [
-  post_count - 1,
-  post_count - 2,
-  post_count - 3
-]
+config_paths = ['./_config-blog.yml', './_config-accesslint.yml']
+config_paths.each do |config|
+  frontmatter = YAML.load_file(config)
+  # Delete all '_posts/'
+  frontmatter['exclude'].delete_if { |x| x.include?('_posts/') }
+  # Add all posts back to exclude
+  stripped_post_directory.each do |post|
+    frontmatter['exclude'] << post
+  end
 
-stripped_post_directory.each_with_index do |post, index|
-  lines << "- #{post}" if !lines.include?("- #{post}\n") && !acceptable_indices.include?(index)
-end
+  # Remove the last two posts
+  frontmatter['exclude'] = frontmatter['exclude'][0...-2]
 
-File.open(config_path, 'w') do |f|
-  f.puts lines
+  frontmatter_new = YAML.dump(frontmatter) << "---\n\n"
+  File.write(config, frontmatter_new)
 end
diff --git a/killport b/killport
new file mode 100755
index 000000000..0900b92fa
--- /dev/null
+++ b/killport
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+#################################################
+# Lists the process running on the passed port  #
+# and then confirms whether you want to kill it #
+#################################################
+#Get the port that the user passed in
+port=$1
+
+if [[ ${#port} == 0 ]]; then
+ echo "Kills a service running on the specified port."
+ echo "usage: killport PORT"
+ exit;
+fi
+
+# Get everything running on this port
+lsofcmd="lsof -i :$port"
+
+# echo the command, and then iterate through each line of the output
+counter=0
+$(echo $lsofcmd) | while read -r line; do
+  echo $line
+  counter=$((counter+1)) # We want to skip the first line, as the first line is the column headers, from lsof
+
+  if [[ $counter > 1 ]]; then
+    procname=$(echo $line | awk '{print $1}')
+    pid=$(echo $line | awk '{print $2}')
+
+    echo "Killing $procname process with PID: $pid"
+    kill -9 $pid;
+  fi
+done
diff --git a/package.json b/package.json
index 2c4796585..6558ccb62 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,9 @@
     "htmlproofer-local": "bundle exec htmlproofer _site --disable-external --allow-hash-href --empty-alt-ignore --url-ignore localhost:4000",
     "lint-508": "bash ./accessibility-scan",
     "rebuild": "rm -rf _site && bundle exec jekyll serve",
-    "test": "bundle exec jekyll test"
+    "test": "bundle exec jekyll test",
+    "pa11y-ci": "pa11y-ci --sitemap http://localhost:4000/site/sitemap.xml",
+    "pa11y-local": "./killport 4000 && ./serve-accesslint && npm run pa11y-ci"
   },
   "repository": {
     "type": "git",
diff --git a/pages/feature-image-test.md b/pages/feature-image-test.md
deleted file mode 100644
index c502aa56d..000000000
--- a/pages/feature-image-test.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-title: Join 18F
-permalink: /feature-image/
-layout: default-intro
-lead: Now’s the time to get involved in transforming how the federal government does technology. Join the digital services movement.
-image: /assets/blog/every-kid-in-a-park/glacier-park.jpg
----
-
-We’re looking for candidates passionate about our mission, with
-top-notch software development, design, content, and operations skills
-to match. We’re a remote-first team with offices in Washington D.C, New
-York City, Chicago, and San Francisco, but we also have teammates working in 26 other cities all over the country. [Read more about how
-we make our distributed model
-work](https://18f.gsa.gov/2015/10/15/best-practices-for-distributed-teams/).
-
-We’re a tech office, but [our employees](https://18f.gsa.gov/team/)
-have a wide range of skills and come from diverse backgrounds. Read how
-our employees describe, in their own words, [why they joined
-18F](https://18f.gsa.gov/2016/03/21/we-asked-100-of-our-coworkers-why-did-you-join-18f/)
-and [the path they took to get
-here](https://18f.gsa.gov/2016/03/22/what-was-your-path-to-18f/).
-
-If you’re interested in joining 18F, you can learn more about the
-interview process, government pay grades, benefits, and our open
-positions at
-[join.18f.gov](https://pages.18f.gov/joining-18f/index.html).
-
-<a class="usa-button" href="https://pages.18f.gov/joining-18f/open-positions/">View open positions</a>
diff --git a/serve-accesslint b/serve-accesslint
index d9261d3b3..4e0ca8328 100755
--- a/serve-accesslint
+++ b/serve-accesslint
@@ -1,11 +1,24 @@
 #!/bin/sh
-
+# Run locally as `./serve-accesslint local`
 set -e
 
 ruby config_blog.rb
 
-LC_ALL="en_US.UTF-8" \
-bundle exec jekyll serve \
-  --detach \
-  --host 0.0.0.0  \
-  --config="_config.yml,_config-blog.yml"
+if [ -z "$1" ]
+  then
+    LC_ALL="en_US.UTF-8" \
+    bundle exec jekyll serve \
+      --detach \
+      --baseurl /site \
+      --host 0.0.0.0 \
+      --config="_config.yml,_config-accesslint.yml"
+  else
+    LC_ALL="en_US.UTF-8" \
+    bundle exec jekyll serve \
+      --watch \
+      --incremental \
+      --baseurl /site \
+      --host 0.0.0.0 \
+      --config="_config.yml,_config-accesslint.yml"
+      echo "serving site locally..."
+fi
diff --git a/sitemap.xml b/sitemap.xml
index fd4a4208a..8b4056b01 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -3,15 +3,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 
-  <!-- url: {{ site.url }} -->
-  <!-- baseurl: {{ site.base_url }} -->
   {% if site.url %}
     {% if site.baseurl == "" %}
-      {% if site.env == 'development' %}
-        {% assign site_url = site.localhost | append: site.baseurl %}
-      {% else %}
-        {% assign site_url = site.url | append: site.baseurl %}
-      {% endif %}
+      {% assign site_url = site.url | append: site.baseurl %}
+    {% elsif site.baseurl == '/site' %}
+      {% assign site_url = site.localhost | append: site.baseurl %}
     {% else %}
       {% assign site_url = site.federalist_url | append: site.baseurl %}
     {% endif %}
diff --git a/spec/_plugins/author_data_spec.rb b/spec/_plugins/author_data_spec.rb
index 34853090b..5cda9188c 100644
--- a/spec/_plugins/author_data_spec.rb
+++ b/spec/_plugins/author_data_spec.rb
@@ -1,10 +1,9 @@
 require_relative '../../_plugins/author_data'
-require 'pry'
-require 'rb-readline'
 
 RSpec.describe SiteData::AuthorData do
   before(:each) do
     root = File.dirname(File.dirname(__FILE__))
+
     @author_data = SiteData::AuthorData.new(root)
     @penned_authors = @author_data.penned_authors
     @excluded_authors = @author_data.excluded_authors
diff --git a/spec/_plugins/team_spec.rb b/spec/_plugins/team_spec.rb
index 051e5361d..a3c831e2b 100644
--- a/spec/_plugins/team_spec.rb
+++ b/spec/_plugins/team_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../_plugins/team'
-require 'pry'
 
 RSpec.describe Jekyll::TeamFilter do
   class TeamFilterClass
diff --git a/spec/_plugins/utlity_spec.rb b/spec/_plugins/utlity_spec.rb
index cdef61bf2..715af6abb 100644
--- a/spec/_plugins/utlity_spec.rb
+++ b/spec/_plugins/utlity_spec.rb
@@ -1,5 +1,4 @@
 require_relative '../../_plugins/utility'
-require 'pry'
 
 RSpec.describe Jekyll::Utility do
   class UtilityClass
diff --git a/spec/_posts/project_page.rb b/spec/_posts/project_page.rb
index eafb14d05..8f5ad2551 100644
--- a/spec/_posts/project_page.rb
+++ b/spec/_posts/project_page.rb
@@ -19,7 +19,7 @@
         "project-type": "Partner",
         "title": "Health and Human Services",
         "subtitle": "Helping states update crucial systems",
-        "image": "/assets/img/projects/hero_stateandlocal.png",
+        "image": "/assets/img/projects/hero_stateandlocal.jpg",
         "image_accessibility": "Grayscale photograph of eleven people meeting in small groups during a workshop",
         "tags": [
           "state and local practice"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f58b8dfad..6dcc8678c 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -6,6 +6,7 @@
 require 'rack/test'
 require 'pry'
 require 'simplecov'
+
 SimpleCov.start
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.