Refactor deployment controller
Merge pull request #75 from ironcladlou/refactor-deploy-controller

Refactor deployment controller