updates routes and controller tests
adds location_settings route tests
Merge pull request #57 from JustAboutJeff/route_rework_and_tests

Route rework and tests
fix merge issue