fix swift/swift-proxy deployment

Addresses the issues with getting swift/swift-proxy deployed via
add charms dialog.

Fixes #135
Fixes #142

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