merge upstream octopress changes into our repo and remove dexter from the ourteam page.

Sorry for the two-topic pull request. I meant to do these separately.