Scaling down removes containers

Squashed version of #162.
Closes #121.
Merge pull request #171 from orchardup/scaling-down-removes-containers

Scaling down removes containers