Added *moar* location services, refactored API processing, went through the gobs and gobs of general house cleaning that resulted
Merge branch 'refactor'