Refactor approach to location
Merge branch 'master' of github.com:jlarigakis/scenic-routing