more servicelocator experiments
Merge branch 'master' of https://github.com/benbradford/k.git