Merge branch 'p' of https://github.com/jfirebaugh/openstreetmap-website into jfirebaugh-p