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?
Add file_recv option to config file template
Add missing master configuration file parameters

This commit adds some recently-added master config options to the online
docs.
correct inaccuracy in cp.push docstring
pep8
Add default value for file_recv master config option.

This prevents a traceback on the master when a minion runs cp.push and
no file_recv parameter is configured.
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.