Implemented the file_ignore_regex and file_ignore_glob feature
Add multiple version support (zypper)

Also, break out the logic that converts the string value to a list of
strings when there are multiple packages and put it in pkg_resource.py
so that the other package providers can use it.
Add multiple version support to list_pkgs (yumpkg)

I also switched list_pkgs so that it parses the rpm command's output
instead of using yum. This reduces a lot of yum overhead and speeds up
this function considerably.
Add pkg arch to version numbers in yumpkg{,5}

This is important because many packages have versions for both x86_64
and i686 installed.
Clean up type checking, add try/except
Add multiple version support to apt
Add multiple version support to ebuild
Add multiple version support for FreeBSD
file_ignore, second iteration
remove pkg arch from list_pkgs output
Spaces for tabs.
Merge pull request #2850 from rrada/develop

Alternatives state/module changes
Add outputter specific to grains
Set the grains to use the new grains outputter
print grains with grains outputter with salt-call -g
Added __is_file_ignored() evaluation to __find_file() and _file_list_emptydirs()
Fix consistancy error for salt-call -g
Fix #2654
Roll back multiple-version support
Merge branch 'develop' of git://github.com/archtaku/salt into archtaku-develop

Conflicts:
	salt/modules/pacman.py
	salt/modules/pkg_resource.py