Revert "Revert "cleanup deploys controller""

This reverts commit 1036d3765f43f5e4a0f8549abf96c2652dd76edc.
fix new and add tests
Merge pull request #159 from zendesk/grosser/deploys

revert + fix deploys