changed apikey and apiid to api_key and api_id and noted that it is boundary tags not ansible tags as per mpdehaan

made changes as requested by mpdehaan and added code to remove key and cert pem files on removal of meter

It's WITH_ITEMS_USES_LIST not WITH_ITEMS_WANTS_LIST.

make name the parameter, with hostname as alias

django_manage: Pass --noinput to migrate

datadog_event module requires urllib2, not httplib2.

name is used throughout Ansible, it's the "standard". This change
applies that standard to the add_host routine and updates the docs to
reflect that. Related to https://github.com/ansible/ansible/pull/3254

The django 'migrate' command should receive the --noinput command,
otherwise it can block waiting for user input.

bug fix for #3077, environment settings for script

changed get_mount_facts to ignore mount types 'none'

datadog_event module: submit your events to DataDog service.

Conflicts:
	library/files/file

Add OpenRC support to the service module.

Removed merge conflict header

Make 'ansible_ssh_user' available in templates

pkg option of apt is not required

Fix typo in PKGBUILD

spelling ansbile->ansible

You can use apt module with update_cache and without specifying a
package. Update the docs to reflect this.

ansbile.cfg -> ansible.cfg

Conflicts:
	library/packaging/apt_key

Added placement_group parameter for cluster compute. Issue 3232.

Document the 'default' argument for vars_prompt.

Fixed a few small typos

Conflicts:
	library/network/get_url