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
Merge pull request #6402 from risaacson/nova-fip

Nova fip
Bump relased in version and update module snippets.

Closes GH-5069
Merge pull request #6403 from risaacson/nova_group

Nova group
nova_compute: Adding the version_added flag to user_data.

Per note in GH-5916.
Merge pull request #6404 from risaacson/pull_5916

nova_compute: Adding the version_added flag to user_data.
Merge branch 'devel' of https://github.com/mragh/ansible into mragh-devel

Conflicts:
	library/cloud/s3
Adding version_added field to metadata field in s3 module
Added metadata support to s3 module
Updated S3 metadata examples
Adding version_added field to metadata field in s3 module
Merge branch 'mragh-devel' into devel
Merge pull request #4493 from sayap/portage

Add packaging module for Gentoo Portage.
Added support for package annotations.
Fix docstring and snippet import style in portage module
Merge pull request #4315 from mgregson/add-digital-ocean-domains

Add digital ocean domains