Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Remove unused import.
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Add state file for keyboard layout
Merge pull request #3113 from techhat/keyboard

Add state file for keyboard layout
Add __virtual__ to keyboard state
Merge pull request #3114 from techhat/keyboard

Add __virtual__ to keyboard state
Add locale (language) state module
Change example to actually use a valid locale
Merge pull request #3115 from techhat/language

Add locale (language) state module
Merge pull request #3117 from jacksontj/develop

Added check for version string.
Fix dependency resolution in the overstate

Fix #3111
Fix overstate recursive call mapping references
Make output data cleaner on the eyes :)
Start on #3101