Refactor deploy controller
Merge pull request #87 from ironcladlou/deploycontroller-refactor

Refactor deploy controller