Merge pull request #457 from s0undt3ch/develop

Renamed the default includes to be less confuse.
Fix getting the value of `include` too soon.
Fix `UnboundLocalError` when failed to authenticated using SSH.
Fix `UnboundLocalError` when failed to authenticated using SSH with EC2.
Merge pull request #459 from s0undt3ch/hotfix/minor-fixes

Hotfix/minor fixes
Merge branch 'develop' of github.com:saltstack/salt-cloud into develop
Update the deploy dir entry in the list, it's path might have been made absolute.
Make the ssh usernames logic equal to both EC2 and AWS(simpler on this one).