Add location permissions
Merge branch 'master' of https://github.com/hans/gilbert-cleanup