gitignore kate files
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
kate undone
Added support for /etc/portage/package.* config files

I've to report an abuse of language in my code:
I've used the word "flag" to refer to everything which follows
the DEPEND atom in those files. This is not correct, they have
different names, but I needed a common word.
Improve file.directory for clean=True

Handle exclude_pat when running with test=True and add
some tests to verify correct behavior.
docstring fixed
Fix windows.

modules/win_pkg.py:
locale.get_locale() doesn't exists. locale.getlocale() does but returns (None, None) on windows. locale.getpreferredencoding() appears to be correct.

modules/win_file.py:
_is_bin appears to have been removed form modules/file.py
Add docs on minion_data_cache
Merge pull request #5459 from faust/portage_config

Added support for /etc/portage/package.* config files
Merge pull request #5479 from cfra/directory-clean

Improve file.directory for clean=True
Add some comments on yaml arg parsing per #5483
Add timeout to salt.state.cmd.* functions

Add ability to specify timeouts for arbitrary commands.
If timeout is reached, subprocess is sent sigterm, and later sigkill
if it still exists. Issue #5322
Update file.py

add function for creating symlink
Merge pull request #5485 from jamesalbert/patch-1

Update file.py
 Ignoring multiple spaces or tabs, while checking for sysctl changes.
Merge pull request #5487 from mlister2006/develop

 Ignoring multiple spaces or tabs, while checking for sysctl changes.
Merge branch 'timeout-for-run-command' of git://github.com/hulu/salt into hulu-timeout-for-run-command

Conflicts:
	salt/states/cmd.py
Update eventlisten script with sock_dir changes