merge changes from staging to master

Post site relaunch, we want to sync master with changes made in staging and staging>feature branches. This will complete the workflow of having the staging site show merged commits from the staging branch, with a pull request from staging to master signaling a request to publish staged content.