Refactoring ServiceCollection

* Remove use of IConfiguration from ServiceCollection
* Removing the Add* methods from IServiceCollection that don't accept an
  IServiceDescriptor

Fixes #116 #117
The underscore splits it as `Method_Condition_Expectation`. Makes it somewhat easier to reason, but I'll change this.