Merge branch 'master' of ssh://cahost.average.org/~/WhereAmI