0.15

Merging in fixes for the following tickets:

* https://github.com/saltstack/salt-cloud/issues/614
* https://github.com/saltstack/salt-cloud/issues/616