Merge pull request #682 from s0undt3ch/develop

Update code to work with the bootstrap script to keep temporary files
Log the missing configuration keys in `is_provider_configured`. Fixes #681.
Merge pull request #684 from s0undt3ch/issues/681-missing-provider-config-vars

Log the missing configuration keys in `is_provider_configured`
fixed bug in creating grains in seperate file.

Refs saltstack/salt-cloud#672
merge grains from map file with existing grains, instead of overwriting
Merge pull request #685 from mafrosis/grains_n_maps

Grains n maps
Properly define en dash both using. Refs #687.
Register an encoding error handler in order to force `ascii`. Fixes #687.

This error handler will try to match known `unicode` characters returned by the could drivers and only those and replace them with an `ascii` one.
Merge pull request #688 from s0undt3ch/issues/687-encoding-issues

Register an encoding error handler in order to force `ascii`