tidied up the dormant/active stuff as it was unecessary and smelled
Merge branch 'master' of github.com:nytlabs/colony