Fix switch so it also looks in the config store.
Tweak errors.
Merge pull request #1320 from howbazaar/fix-switch

Fix switch so it also looks in the config store.

Fixes https://bugs.launchpad.net/juju-core/+bug/1334768

(Review request: http://reviews.vapour.ws/r/639/)