Copy query function from s3 execution module to salt.utils
Move the documentation around
Finish moving query into salt.utils.s3
Add M2Crypto dependency back in to the installation requirements

* It was removed 3867ffb3efff2df97b4bb82b9fb2afa703786a47 but not added
  back when the patch was reverted.
Merge pull request #3932 from techhat/s3

Move S3 functionality into salt.utils
Add obfuscate_templates option, fix #3902
fix oversight in test=True system
Fix spelling error
Merge pull request #3933 from dcolish/correct-installation-index-doc

Add M2Crypto dependency back in to the installation requirements
Fix #3894

The apt code here is raising an exception, this should most likely
not be happening
Death to some double quotes
Fix #3885
Change Windows Codepage to US English
repair some legacy logic agound grain overrides, fix #3882
Factor out state check function, fix #3873
Send chcp output to nul to not pollute returns
Correcting a logic error where for loop would continue
instead of returning when the catalina_home is found.

Additionally using glob.glob('/usr/local/tomcat*') might be
dangerous because it could return invalid catalina_homes::

 >>> import glob
 >>> glob.glob( '/usr/share/tomcat*' )
 ['/usr/share/tomcat7-root', '/usr/share/tomcat7']

	modified:   tomcat.py
Make salt-call not infinate loop when auth fails, ref #3863
Merge pull request #3934 from UtahDave/win_set_codepage

On Windows set codepage to US English so cmd functions can be parsed in a consistent manner. This is similar to how it's done on Linux.
Merge pull request #3935 from russellballestrini/develop

Correcting a logic error where for loop would continue