improvements to location templates and some light weight removal of older orphaned template files.
Merge pull request #1 from jessykate/centralized

worked on templates