More controller refactoring
Merge pull request #85 from ironcladlou/deployconfig-refactor

More controller refactoring