Resolve #30 - Remove the Service Locator from the project

The Service Locator is really a bit of an anti-pattern and rather than splitting
it up, it is actually better to just remove it altogether.  In the future, use
a proper DI container instead.