Merge lp:~james-page/juju-deployer/fixup-subs-cli into lp:juju-deployer

[James Page]

Fixup use of suboridinates from the deployer CLI

=== modified file 'deployer/env/base.py'
--- deployer/env/base.py	2013-11-12 04:54:58 +0000
+++ deployer/env/base.py	2014-04-11 15:35:31 +0000
@@ -85,7 +85,7 @@
                 params.extend(["--config", fh.name])
             if constraints:
                 params.extend(['--constraints', constraints])
-            if num_units != 1:
+            if num_units not in [1, None]:
                 params.extend(["--num-units", str(num_units)])
             if charm_url.startswith('local'):
                 if repo == "":