merge conflicts
Merge branch 'master' of https://github.com/jmfolds/geohappenings into gh-pages