Deploy with configuration options if available

Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
set machine status to ready in maas

Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
pull in master to apply cleanly for the charm deploy configuration options

Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>

Conflicts:
	cloudinstall/charms/__init__.py
	cloudinstall/charms/jujugui.py
	cloudinstall/charms/keystone.py
	cloudinstall/gui.py