diff --git a/cloud/amazon/ec2_ami_find.py b/cloud/amazon/ec2_ami_find.py
index f5ed91baab5..ce7506e0961 100644
--- a/cloud/amazon/ec2_ami_find.py
+++ b/cloud/amazon/ec2_ami_find.py
@@ -163,14 +163,133 @@ EXAMPLES = '''
     wait: yes
 '''
 
+RETURN = '''
+ami_id:
+    description: id of found amazon image
+    returned: when AMI found
+    type: string
+    sample: "ami-e9095e8c"
+architecture:
+    description: architecture of image
+    returned: when AMI found
+    type: string
+    sample: "x86_64"
+architecture:
+    description: architecture of image
+    returned: when AMI found
+    type: string
+    sample: "x86_64"
+block_device_mapping:
+    description: block device mapping associated with image
+    returned: when AMI found
+    type: dictionary of block devices
+    sample: "{
+        '/dev/xvda': {
+            'delete_on_termination': true,
+            'encrypted': false,
+            'size': 8,
+            'snapshot_id': 'snap-ca0330b8',
+            'volume_type': 'gp2'
+    }"
+creationDate:
+    description: creation date of image
+    returned: when AMI found
+    type: string
+    sample: "2015-10-15T22:43:44.000Z"
+description:
+    description: description of image
+    returned: when AMI found
+    type: string
+    sample: "test-server01"
+hypervisor:
+    description: type of hypervisor
+    returned: when AMI found
+    type: string
+    sample: "xen"
+is_public:
+    description: whether image is public
+    returned: when AMI found
+    type: bool
+    sample: false
+location:
+    description: location of image
+    returned: when AMI found
+    type: string
+    sample: "435210894375/test-server01-20151015-234343"
+name:
+    description: ami name of image
+    returned: when AMI found
+    type: string
+    sample: "test-server01-20151015-234343"
+owner_id:
+    description: owner of image
+    returned: when AMI found
+    type: string
+    sample: "435210894375"
+platform:
+    description: plaform of image
+    returned: when AMI found
+    type: string
+    sample: null
+root_device_name:
+    description: rood device name of image
+    returned: when AMI found
+    type: string
+    sample: "/dev/xvda"
+root_device_type:
+    description: rood device type of image
+    returned: when AMI found
+    type: string
+    sample: "ebs"
+state:
+    description: state of image
+    returned: when AMI found
+    type: string
+    sample: "available"
+tags:
+    description: tags assigned to image
+    returned: when AMI found
+    type: dictionary of tags
+    sample: "{
+        'Environment': 'devel',
+        'Name': 'test-server01',
+        'Role': 'web'
+    }"
+virtualization_type:
+    description: image virtualization type
+    returned: when AMI found
+    type: string
+    sample: "hvm"
+'''
+
 try:
     import boto.ec2
+    from boto.ec2.blockdevicemapping import BlockDeviceType, BlockDeviceMapping
     HAS_BOTO=True
 except ImportError:
     HAS_BOTO=False
 
 import json
 
+def get_block_device_mapping(image):
+    """
+    Retrieves block device mapping from AMI
+    """
+
+    bdm_dict = dict()
+    bdm = getattr(image,'block_device_mapping')
+    for device_name in bdm.keys():
+        bdm_dict[device_name] = {
+            'size': bdm[device_name].size,
+            'snapshot_id': bdm[device_name].snapshot_id,
+            'volume_type': bdm[device_name].volume_type,
+            'encrypted': bdm[device_name].encrypted,
+            'delete_on_termination': bdm[device_name].delete_on_termination
+        }
+
+    return bdm_dict
+
+
 def main():
     argument_spec = ec2_argument_spec()
     argument_spec.update(dict(
@@ -255,8 +374,12 @@ def main():
         data = {
             'ami_id': image.id,
             'architecture': image.architecture,
+            'block_device_mapping': get_block_device_mapping(image),
+            'creationDate': image.creationDate,
             'description': image.description,
+            'hypervisor': image.hypervisor,
             'is_public': image.is_public,
+            'location': image.location,
             'name': image.name,
             'owner_id': image.owner_id,
             'platform': image.platform,
@@ -299,4 +422,3 @@ from ansible.module_utils.ec2 import *
 
 if __name__ == '__main__':
     main()
-
diff --git a/cloud/openstack/keystone_user.py b/cloud/openstack/_keystone_user.py
similarity index 99%
rename from cloud/openstack/keystone_user.py
rename to cloud/openstack/_keystone_user.py
index babcc3cc569..48cc87b241a 100644
--- a/cloud/openstack/keystone_user.py
+++ b/cloud/openstack/_keystone_user.py
@@ -21,6 +21,7 @@ DOCUMENTATION = '''
 ---
 module: keystone_user
 version_added: "1.2"
+deprecated: Deprecated in 2.0. Use os_user instead
 short_description: Manage OpenStack Identity (keystone) users, tenants and roles
 description:
    - Manage users,tenants, roles from OpenStack.
diff --git a/cloud/openstack/os_user.py b/cloud/openstack/os_user.py
new file mode 100644
index 00000000000..f5baa6fc75a
--- /dev/null
+++ b/cloud/openstack/os_user.py
@@ -0,0 +1,212 @@
+#!/usr/bin/python
+# Copyright (c) 2015 Hewlett-Packard Development Company, L.P.
+#
+# This module is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this software.  If not, see <http://www.gnu.org/licenses/>.
+
+
+try:
+    import shade
+    HAS_SHADE = True
+except ImportError:
+    HAS_SHADE = False
+
+DOCUMENTATION = '''
+---
+module: os_user
+short_description: Manage OpenStack Identity Users
+extends_documentation_fragment: openstack
+version_added: "2.0"
+description:
+    - Manage OpenStack Identity users. Users can be created,
+      updated or deleted using this module. A user will be updated
+      if I(name) matches an existing user and I(state) is present.
+      The value for I(name) cannot be updated without deleting and
+      re-creating the user.
+options:
+   name:
+     description:
+        - Username for the user
+     required: true
+   password:
+     description:
+        - Password for the user
+     required: true when I(state) is present
+     default: None
+   email:
+     description:
+        - Email address for the user
+     required: false
+     default: None
+   default_project:
+     description:
+        - Project name or ID that the user should be associated with by default
+     required: false
+     default: None
+   domain:
+     description:
+        - Domain to create the user in if the cloud supports domains
+     required: false
+     default: None
+   enabled:
+     description:
+        - Is the user enabled
+     required: false
+     default: True
+   state:
+     description:
+       - Should the resource be present or absent.
+     choices: [present, absent]
+     default: present
+requirements:
+    - "python >= 2.6"
+    - "shade"
+'''
+
+EXAMPLES = '''
+# Create a user
+- os_user:
+    cloud: mycloud
+    state: present
+    name: demouser
+    password: secret
+    email: demo@example.com
+    domain: default
+    default_project: demo
+
+# Delete a user
+- os_user:
+    cloud: mycloud
+    state: absent
+    name: demouser
+'''
+
+
+RETURN = '''
+user:
+    description: Dictionary describing the user.
+    returned: On success when I(state) is 'present'
+    type: dictionary
+    contains:
+        default_project_id:
+            description: User default project ID. Only present with Keystone >= v3.
+            type: string
+            sample: "4427115787be45f08f0ec22a03bfc735"
+        domain_id:
+            description: User domain ID. Only present with Keystone >= v3.
+            type: string
+            sample: "default"
+        email:
+            description: User email address
+            type: string
+            sample: "demo@example.com"
+        id:
+            description: User ID
+            type: string
+            sample: "f59382db809c43139982ca4189404650"
+        name:
+            description: User name
+            type: string
+            sample: "demouser"
+'''
+
+def _needs_update(module, user):
+    keys = ('email', 'default_project', 'domain', 'enabled')
+    for key in keys:
+        if module.params[key] is not None and module.params[key] != user.get(key):
+            return True
+
+    # We don't get password back in the user object, so assume any supplied
+    # password is a change.
+    if module.params['password'] is not None:
+        return True
+
+    return False
+
+def main():
+
+    argument_spec = openstack_full_argument_spec(
+        name=dict(required=True),
+        password=dict(required=False, default=None),
+        email=dict(required=False, default=None),
+        default_project=dict(required=False, default=None),
+        domain=dict(required=False, default=None),
+        enabled=dict(default=True, type='bool'),
+        state=dict(default='present', choices=['absent', 'present']),
+    )
+
+    module_kwargs = openstack_module_kwargs()
+    module = AnsibleModule(
+        argument_spec,
+        required_if=[
+            ('state', 'present', ['password'])
+        ],
+        **module_kwargs)
+
+    if not HAS_SHADE:
+        module.fail_json(msg='shade is required for this module')
+
+    name = module.params['name']
+    password = module.params['password']
+    email = module.params['email']
+    default_project = module.params['default_project']
+    domain = module.params['domain']
+    enabled = module.params['enabled']
+    state = module.params['state']
+
+    try:
+        cloud = shade.openstack_cloud(**module.params)
+        user = cloud.get_user(name)
+
+        project_id = None
+        if default_project:
+            project = cloud.get_project(default_project)
+            if not project:
+                module.fail_json(msg='Default project %s is not valid' % default_project)
+            project_id = project['id']
+
+        if state == 'present':
+            if user is None:
+                user = cloud.create_user(
+                    name=name, password=password, email=email,
+                    default_project=default_project, domain_id=domain,
+                    enabled=enabled)
+                changed = True
+            else:
+                if _needs_update(module, user):
+                    user = cloud.update_user(
+                        user['id'], password=password, email=email,
+                        default_project=project_id, domain_id=domain,
+                        enabled=enabled)
+                    changed = True
+                else:
+                    changed = False
+            module.exit_json(changed=changed, user=user)
+
+        elif state == 'absent':
+            if user is None:
+                changed=False
+            else:
+                cloud.delete_user(user['id'])
+                changed=True
+            module.exit_json(changed=changed)
+
+    except shade.OpenStackCloudException as e:
+        module.fail_json(msg=e.message, extra_data=e.extra_data)
+
+from ansible.module_utils.basic import *
+from ansible.module_utils.openstack import *
+
+
+if __name__ == '__main__':
+    main()
diff --git a/files/stat.py b/files/stat.py
index 2e088fc8dbd..8f2bd289bc0 100644
--- a/files/stat.py
+++ b/files/stat.py
@@ -245,8 +245,8 @@ stat:
         lnk_source:
             description: Original path
             returned: success, path exists and user can read stats and the path is a symbolic link
-            type: boolean
-            sample: True
+            type: string
+            sample: /home/foobar/21102015-1445431274-908472971
         md5:
             description: md5 hash of the path
             returned: success, path exists and user can read stats and path supports hashing and md5 is supported
diff --git a/system/ping.py b/system/ping.py
index bea7fb22f1d..1449cf5dca9 100644
--- a/system/ping.py
+++ b/system/ping.py
@@ -23,19 +23,20 @@ DOCUMENTATION = '''
 ---
 module: ping
 version_added: historical
-short_description: Try to connect to host and return C(pong) on success.
+short_description: Try to connect to host, veryify a usable python and return C(pong) on success.
 description:
    - A trivial test module, this module always returns C(pong) on successful
      contact. It does not make sense in playbooks, but it is useful from
-     C(/usr/bin/ansible)
+     C(/usr/bin/ansible) to verify the ability to login and that a usable python is configured.
+   - This is NOT ICMP ping, this is just a trivial test module.
 options: {}
-author: 
+author:
     - "Ansible Core Team"
     - "Michael DeHaan"
 '''
 
 EXAMPLES = '''
-# Test 'webservers' status
+# Test we can logon to 'webservers' and execute python with json lib.
 ansible webservers -m ping
 '''
 
diff --git a/system/user.py b/system/user.py
index c2e4956f897..c04b748f068 100755
--- a/system/user.py
+++ b/system/user.py
@@ -2045,7 +2045,7 @@ def main():
             comment=dict(default=None, type='str'),
             home=dict(default=None, type='str'),
             shell=dict(default=None, type='str'),
-            password=dict(default=None, type='str'),
+            password=dict(default=None, type='str', no_log=True),
             login_class=dict(default=None, type='str'),
             # following options are specific to userdel
             force=dict(default='no', type='bool'),
@@ -2063,7 +2063,7 @@ def main():
             ssh_key_type=dict(default=ssh_defaults['type'], type='str'),
             ssh_key_file=dict(default=None, type='str'),
             ssh_key_comment=dict(default=ssh_defaults['comment'], type='str'),
-            ssh_key_passphrase=dict(default=None, type='str'),
+            ssh_key_passphrase=dict(default=None, type='str', no_log=True),
             update_password=dict(default='always',choices=['always','on_create'],type='str'),
             expires=dict(default=None, type='float'),
         ),
@@ -2161,4 +2161,5 @@ def main():
 
 # import module snippets
 from ansible.module_utils.basic import *
-main()
+if __name__ == '__main__':
+    main()