Add vlan support in juju-bootstrap node
Allow a config file to predefine variables and skip prompts.
fix spacing on usage
Add example config file for documentation.

Signed-off-by: Michael McCracken <mike.mccracken@canonical.com>
Fix OPTS string - re-add colon after opt_configfile
merge with origin/master
update usage comment again
add HELP back to usage shortopt list
Add network/interfaces.d to network config backup
Add swift and swift-proxy charms. Refactor charm config.
rename to avoid python module name problems
Merge pull request #21 from mikemccracken/swift-charms

Add swift charms - Merged without much testing to hand off work to stokes
Update swift charms to deploy properly without _id defined

Issue in the charm setup where if _id wasn't defined and we override
setup then the gui polling would traceback b/c of undefined _id.

Some pyflakes cleanups in this commit as well.

Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
give the main node more CPUs in single install
move example to separate file
install example file
merge and correct usage message
Merge branch 'master' into backup-network-interfaces-dir
Add JujuState tests to cover services, machines and containers for current output pre- and post-deploy.
Merge pull request #23 from mikemccracken/refactor-jujustate-tests

Add JujuState tests to cover services, machines and containers