Merge pull request #7119 from jjshoe/patch-4

Finish reverting a broken commit in #5679
Clarify lookup plugin execution location per request.
Merge pull request #6994 from tonk/docfix

Fix documentation error
Merge pull request #6984 from clconway/variable-re-doc

Adds search/match examples to "Playbooks > Variables > Jinja2 Filters" d...
Forgot to add an assertion for the new rsync_path test
Slight tweak to regex examples.
Merge branch 'patch-2' of https://github.com/budlight/ansible into budlight-patch-2
Merge branch 'budlight-patch-2' into devel
Merge pull request #7208 from jf/copy-module

Fix "no_log=True" option for copy module (fixes #7193)
updated docs to include snapshot_tags option

added version
added example
Merge pull request #7215 from lorin/doc-ec2-nocache

Document how to turn off ec2 cache
Updating Makefile for setuptools change

Fixes #7224
Fix dates from RPM SPEC changelog

`make rpm` gives these warnings:

    warning: bogus date in %changelog: Thu Feb 28 2014 Michael DeHaan <michael.dehaan@g.c> - 1.5-0
    warning: bogus date in %changelog: Thu Jul 05 2013 Michael DeHaan <michael.dehaan@g.c> - 1.2-2
    warning: bogus date in %changelog: Thu Aug 6 2012 Michael DeHaan <michael.dehaan@g.c> - 0.7-0

    RPM build errors:
        bogus date in %changelog: Thu Feb 28 2014 Michael DeHaan <michael.dehaan@g.c> - 1.5-0
        bogus date in %changelog: Thu Jul 05 2013 Michael DeHaan <michael.dehaan@g.c> - 1.2-2
        bogus date in %changelog: Thu Aug 6 2012 Michael DeHaan <michael.dehaan@g.c> - 0.7-0
fix issue #7228 ec2_vol crash
Adding BuildRequires lines for python-setuptools
Merge pull request #7230 from binarytemple/fix_for_issue_7228

fix issue #7228 ec2_vol crash
Merge pull request #7225 from ciupicri/devel-rpm-changelog

Fix dates from RPM SPEC changelog
Fixing a bad merge commit in packaging/debian/changelog
Adding an ec2_elb test to re-add an instance that had been removed