Clarify .ssh/config port usage.
Merge branch 'feature/multi-version-import' of https://github.com/abadger/ansible into abadger-feature/multi-version-import
Add an example of how to reload local facts.
In apt module show 'name' vs pkg to standardize with the rest of the modules.  'pkg' is an alias for name.
Merge pull request #6794 from follower/patch-4

Make `vpc_security_group` docs more accurate
Cleaning up the import testing around setuptools
Merge branch 'abadger-feature/multi-version-import' into devel
Merge branch 'delegate_to_honor_ssh_private_key_file' of https://github.com/renard/ansible into renard-delegate_to_honor_ssh_private_key_file
Commenting out pkg_resources lines for now, as they break hacking/env-setup
Merge pull request #7186 from jf/docfix-obvious-quick-simples

Obvious quick fixes:
Add Mavericks install notes
Adding a new test for the synchronize module to test rsync_path
Minor tweak to rsync_path construction in synchronize module

Fixes #7182
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