comment location awareness; some other fixes...
Merge branch 'master' of https://github.com/databrary/play