Location usage tracking: aled's changes
Merge pull request #1 from aledsage/feature/location-usage-adam

Tidies/improvements to location usage tracking