Moved Di definitions to new class based format
Merge pull request #14 from jakeasmith/config

Moved Di definitions to new class based format