Merge branch 'josephtate-devel' into devel
Update docstrings in ec2_vol
Merge branch 'ec2-eip-reuse' of https://github.com/silkapp/ansible into silkapp-ec2-eip-reuse
Merge pull request #4845 from lorin/ec2_ubuntu_ami

New module: ec2_ami_search
Renaming reuse parameter in ec2_eip and adding a version_added string
Merge branch 'silkapp-ec2-eip-reuse' into devel
Update docstrings in ec2_ami_search
Merge pull request #5935 from zimbatm/do-backups

library/digital_ocean: Adds the missing backups_enabled create option
Update docstring in digital_ocean for backups_enabled version_added
Merge pull request #6394 from jlaska/gitignore_test_output

Add generated test files to .gitignore
Added support for pkgng multiple repositories.

Currently checking if pkgng >= 1.1.4, as specified in
https://wiki.freebsd.org/pkgng . I guess that's when using PKGSITE was
deprecated.
Changed old variable names that referred to pkgin.
Added multi VPC support

Initial commit

Refactored terminate_vpc method to support vpc_id_tags

Cleaned up find_vpc() method
Renamed vpc_id_tags to resource_tags
Updated module documentation, re: resource_tags
Added code to create tags on the VPC resource
Added 'version_added' to the 'resrouce_tags' attribute in DOCUMENTATION section.
Fixing up some docstrings causing make webdocs to fail
bug 5959: https://github.com/ansible/ansible/issues/5959
Bump relased in version and update module snippets.

Closes GH-5154