Add `--force` flag to `zpm deploy`

This forces/allows deployment to non-empty containers.
test_zpm: rename a variable (trivial change)
Merge pull request #178 from larsbutler/deploy-force

Allow user to force deployment to a non-empty container