Move DI setup into it's own method so Configuration method is legible.
Merge pull request #697 from Tratcher/master

Move DI Setup into its own method