Prep for Tom's map fix merge
Merge branch 'master' of github.com:ecmoondog/thebeatenpath
Merge branch 'master' of github.com:ecmoondog/thebeatenpath