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.
Add swap functions to mount.py per #5364
Add mount.swap state function, fix #5364
Fix `replace` arg for file.managed state, Fix #5460

Previously, if replace was False, we had correct behavior if the file
existed (we would fix perms etc), but if it didn't exist, we would just
touch the file.  Now, if the file doesn't exist it will act exactly the
same as in the replace=True case -- create the file from the source or
from contents.
Merge pull request #5470 from basepi/managed5460

Fix `replace` arg for file.managed state, Fix #5460
Fix virtualenv paths on windows.
No need to activate venv to run pip freeze
apt: fix pkg.latest_version

If a particular package name is both the name of a package and also the
name of a virtual package, the version comparison used to determine if
the install candidate is an upgrade fails. This commit fixes #5455 by
stripping the virtual package markers from the package list returned by
list_pkgs().
Merge pull request #5471 from olliewalsh/venv-windows

Fix issue #5462
Switch to pkg.compare for version comparison

perform_cmp is really only supposed to be used under-the-hood, while
pkg.compare makes for easier-to-read code.
Merge pull request #5472 from terminalmage/issue5455

apt: fix pkg.latest_version
Merge pull request #5473 from terminalmage/quickfix

Switch to pkg.compare for version comparison
Fix function typo
Merge pull request #5474 from UtahDave/develop

Fix function typo
Make the pillar.data docstring make a little more sense
Fix module name typo