Initial changes to mysql module to allow us to get useful output from SHOW and DESC queries to the server
added support for order clauses in pillar top files

Conflicts:
	tests/unit/pillar_test.py
Adds example to Using Peer Communication with a specified matcher

It took me a while to figure out I could do this, thought I'd clarify with an example.

Should more examples (for other matchers) be added?
Merge pull request #6578 from tomeduarte/patch-1

Adds example to Using Peer Communication with a specified matcher
less confusing string terminology; capitalize SSH
Merge pull request #6582 from hulu/string-terminology

less confusing string terminology; capitalize SSH
Merge pull request #6579 from terminalmage/develop

Fix traceback on master when cp.push is used without file_recv being set
Fix bad ref to srcpath
Initial add of runner being called from the master
Fix formatting in salt.states.pkg.py
Merge pull request #6584 from basepi/pkgformatting

Fix formatting in salt.states.pkg.py
Fix some formatting
Add config.merge function for merginc config values across sources
Use config.merge instead of config.option for scheduling, Fix #6201
Added function filter_by to grains module

This will help to keep too much conditional logic out of Jinja templates
by allowing the creation of unobtrusive lookup tables.
Debian Package Architechture

Debian packages are allowed to designate the package as
architecture-independent by specifying the value 'all' in the
Architecture field of debian/control. Update
salt.modules.apt.install (via
salt.modules.pkg_resource._parse_pkg_meta) to respect this and not
require ':all' appended to a package name in order to install it on a
64bit machine.
Add async runner call to RunnerClient
Add token getting to the auth resolver
Add a CLI example to config.merge
Merge pull request #6586 from whiteinge/grains-filter_by

Added function filter_by to grains module