Location mapper and tests
Merge pull request #24 from brendanfmartin/locationMapper

Location mapper and tests