Merge pull request #286 from s0undt3ch/develop

Update the parsers code to use salt's `MergeConfigMixIn`.
Fix the `salt-bootstrap` wrapper scripts calls.
Merge pull request #288 from s0undt3ch/hotfix/fix-one-liners

Fix the `salt-bootstrap` wrapper scripts calls.
Merge branch 'develop' of github.com:saltstack/salt-cloud into develop