Flesh out pickup contact info.
Merge branch 'master' into gh-pages

* master:
  Flesh out pickup contact info.