Next version
Minor refactoring
Fixed test namespacing
Added di aliases
Injection test
Fixed failing test
Various updates
Merge pull request #1 from GrahamCampbell/develop

Develop