diff --git a/cloud/cloudformation b/cloud/cloudformation
index afacb694f13..af401036c75 100644
--- a/cloud/cloudformation
+++ b/cloud/cloudformation
@@ -293,7 +293,7 @@ def main():
 
     module.exit_json(**result)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/cloud/digital_ocean b/cloud/digital_ocean
index 6309fd726b9..400bf3bf54b 100644
--- a/cloud/digital_ocean
+++ b/cloud/digital_ocean
@@ -419,7 +419,7 @@ def main():
     except (DoError, Exception) as e:
         module.fail_json(msg=str(e))
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/cloud/docker b/cloud/docker
index e6a25ef139a..f97c6988be3 100644
--- a/cloud/docker
+++ b/cloud/docker
@@ -479,7 +479,7 @@ def main():
         changed = manager.has_changed()
         module.exit_json(failed=True, changed=changed, msg=repr(e))
         
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/cloud/gc_storage b/cloud/gc_storage
index ccce877bd35..17549b32ecb 100644
--- a/cloud/gc_storage
+++ b/cloud/gc_storage
@@ -413,7 +413,7 @@ def main():
             module.fail_json(msg="Bucket and Object parameters must be set", failed=True)
 
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/cloud/gce b/cloud/gce
index 598c279a72a..bc9dbc96a9b 100644
--- a/cloud/gce
+++ b/cloud/gce
@@ -416,7 +416,7 @@ def main():
     print json.dumps(json_output)
     sys.exit(0)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/cloud/gce_lb b/cloud/gce_lb
index 415f36c5b7f..eec637ad487 100644
--- a/cloud/gce_lb
+++ b/cloud/gce_lb
@@ -327,7 +327,7 @@ def main():
     print json.dumps(json_output)
     sys.exit(0)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/cloud/gce_net b/cloud/gce_net
index 8c0f3fc05b5..5e8d038c585 100644
--- a/cloud/gce_net
+++ b/cloud/gce_net
@@ -267,7 +267,7 @@ def main():
     print json.dumps(json_output)
     sys.exit(0)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/cloud/gce_pd b/cloud/gce_pd
index b2aa27d21ff..34b28d9d92c 100644
--- a/cloud/gce_pd
+++ b/cloud/gce_pd
@@ -249,7 +249,7 @@ def main():
     print json.dumps(json_output)
     sys.exit(0)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/cloud/keystone_user b/cloud/keystone_user
index 2ccaef175fa..ae8e157c4e3 100644
--- a/cloud/keystone_user
+++ b/cloud/keystone_user
@@ -385,7 +385,7 @@ def dispatch(keystone, user=None, password=None, tenant=None,
 
     return dict(changed=changed, id=id)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 if __name__ == '__main__':
     main()
diff --git a/cloud/linode b/cloud/linode
index 04265409099..deb7a9f3670 100644
--- a/cloud/linode
+++ b/cloud/linode
@@ -482,7 +482,7 @@ def main():
     linodeServers(module, api, state, name, plan, distribution, datacenter, linode_id, 
                  payment_term, password, ssh_pub_key, swap, wait, wait_timeout)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/cloud/rds b/cloud/rds
index b7eb5bb0a50..85ded62d59e 100644
--- a/cloud/rds
+++ b/cloud/rds
@@ -533,7 +533,7 @@ def main():
 
     module.exit_json(changed=True, instance=d)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/cloud/virt b/cloud/virt
index 551768e2a6a..42e99209b14 100644
--- a/cloud/virt
+++ b/cloud/virt
@@ -477,6 +477,6 @@ def main():
         module.exit_json(**result)
 
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/database/mongodb_user b/database/mongodb_user
index ab3a027e0a2..b2fa045071b 100644
--- a/database/mongodb_user
+++ b/database/mongodb_user
@@ -213,6 +213,6 @@ def main():
 
     module.exit_json(changed=True, user=user)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/database/mysql_db b/database/mysql_db
index 2e91a66f790..f949cced301 100644
--- a/database/mysql_db
+++ b/database/mysql_db
@@ -301,6 +301,6 @@ def main():
 
     module.exit_json(changed=changed, db=db)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/database/mysql_replication b/database/mysql_replication
index 0659ac524c9..f18060e9556 100644
--- a/database/mysql_replication
+++ b/database/mysql_replication
@@ -363,6 +363,6 @@ def main():
         else:
             module.exit_json(msg="Slave already stopped", changed=False)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/database/mysql_user b/database/mysql_user
index 4542f4dd371..1eeb81f112c 100644
--- a/database/mysql_user
+++ b/database/mysql_user
@@ -461,6 +461,6 @@ def main():
             changed = False
     module.exit_json(changed=changed, user=user)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/database/mysql_variables b/database/mysql_variables
index 0bb5397334b..720478cc005 100644
--- a/database/mysql_variables
+++ b/database/mysql_variables
@@ -211,6 +211,6 @@ def main():
         else:
             module.fail_json(msg=result, changed=False)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/database/postgresql_db b/database/postgresql_db
index 11b77092f2a..7c4d5a99ac9 100644
--- a/database/postgresql_db
+++ b/database/postgresql_db
@@ -269,6 +269,6 @@ def main():
 
     module.exit_json(changed=changed, db=db)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/database/postgresql_privs b/database/postgresql_privs
index e1bf03614ff..2f3db9a93f1 100644
--- a/database/postgresql_privs
+++ b/database/postgresql_privs
@@ -607,6 +607,6 @@ def main():
     module.exit_json(changed=changed)
 
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/database/postgresql_user b/database/postgresql_user
index 1798eafcc12..1bda98d18cb 100644
--- a/database/postgresql_user
+++ b/database/postgresql_user
@@ -481,6 +481,6 @@ def main():
     kw['changed'] = changed
     module.exit_json(**kw)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/database/redis b/database/redis
index ead1a1dacf0..4e3793daa09 100644
--- a/database/redis
+++ b/database/redis
@@ -276,6 +276,6 @@ def main():
     else:
         module.fail_json(msg='A valid command must be provided')
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/database/riak b/database/riak
index 712c94e994e..21673fa0135 100644
--- a/database/riak
+++ b/database/riak
@@ -249,7 +249,7 @@ def main():
 
     module.exit_json(**result)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/files/acl b/files/acl
index 1dbaf198b6f..0b1ff4f0f08 100644
--- a/files/acl
+++ b/files/acl
@@ -191,7 +191,7 @@ def main():
     msg="%s. %d entries changed" % (msg,changes)
     module.exit_json(changed=changed, msg=msg, acl=currentacl)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/files/assemble b/files/assemble
index c16afe61311..d11276a4a5c 100644
--- a/files/assemble
+++ b/files/assemble
@@ -173,7 +173,7 @@ def main():
     # Mission complete
     module.exit_json(src=src, dest=dest, md5sum=destmd5, changed=changed, msg="OK")
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/files/copy b/files/copy
index 2ba313eb7e2..8af38d41aa4 100644
--- a/files/copy
+++ b/files/copy
@@ -184,6 +184,6 @@ def main():
 
     module.exit_json(**res_args)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/files/file b/files/file
index a26373f7284..134b5284efd 100644
--- a/files/file
+++ b/files/file
@@ -349,7 +349,7 @@ def main():
     else:
         module.fail_json(path=path, msg='unexpected position reached')
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
 
diff --git a/files/ini_file b/files/ini_file
index 6bed212b517..d25d468cd17 100644
--- a/files/ini_file
+++ b/files/ini_file
@@ -184,6 +184,6 @@ def main():
     # Mission complete
     module.exit_json(dest=dest, changed=changed, msg="OK")
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/files/lineinfile b/files/lineinfile
index 185734c0c28..82658cae654 100644
--- a/files/lineinfile
+++ b/files/lineinfile
@@ -356,7 +356,7 @@ def main():
 
         absent(module, dest, params['regexp'], params.get('line', None), backup)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/files/stat b/files/stat
index 6f38534d383..54cc11111a5 100644
--- a/files/stat
+++ b/files/stat
@@ -133,7 +133,7 @@ def main():
 
     module.exit_json(changed=False, stat=d)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/files/unarchive b/files/unarchive
index 519fa9a34f2..52d0f49a9f9 100644
--- a/files/unarchive
+++ b/files/unarchive
@@ -194,6 +194,6 @@ def main():
 
     module.exit_json(**res_args)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/files/xattr b/files/xattr
index 5b07405717a..25179e3c628 100644
--- a/files/xattr
+++ b/files/xattr
@@ -200,7 +200,7 @@ def main():
 
     module.exit_json(changed=changed, msg=msg, xattr=res)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/internal/async_status b/internal/async_status
index 0f2290aa5c0..853f4533765 100644
--- a/internal/async_status
+++ b/internal/async_status
@@ -94,6 +94,6 @@ def main():
 
     module.exit_json(**data)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/messaging/rabbitmq_parameter b/messaging/rabbitmq_parameter
index 817b2705e50..2b540cbfdee 100644
--- a/messaging/rabbitmq_parameter
+++ b/messaging/rabbitmq_parameter
@@ -146,6 +146,6 @@ def main():
 
     module.exit_json(changed=changed, component=component, name=name, vhost=vhost, state=state)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/messaging/rabbitmq_plugin b/messaging/rabbitmq_plugin
index d35827afa33..3a6e02122d3 100644
--- a/messaging/rabbitmq_plugin
+++ b/messaging/rabbitmq_plugin
@@ -125,6 +125,6 @@ def main():
     changed = len(enabled) > 0 or len(disabled) > 0
     module.exit_json(changed=changed, enabled=enabled, disabled=disabled)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/messaging/rabbitmq_user b/messaging/rabbitmq_user
index dcf09aa93d0..175bc0c1624 100644
--- a/messaging/rabbitmq_user
+++ b/messaging/rabbitmq_user
@@ -243,6 +243,6 @@ def main():
 
     module.exit_json(changed=changed, user=username, state=state)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/messaging/rabbitmq_vhost b/messaging/rabbitmq_vhost
index 3486727c246..122f84e5761 100644
--- a/messaging/rabbitmq_vhost
+++ b/messaging/rabbitmq_vhost
@@ -141,6 +141,6 @@ def main():
 
     module.exit_json(changed=changed, name=name, state=state)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/monitoring/airbrake_deployment b/monitoring/airbrake_deployment
index fe164fdd432..b77b3a70419 100644
--- a/monitoring/airbrake_deployment
+++ b/monitoring/airbrake_deployment
@@ -126,7 +126,7 @@ def main():
         else:
             module.fail_json(msg="HTTP result code: %d" % result.code)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
 
diff --git a/monitoring/datadog_event b/monitoring/datadog_event
index 2dcd932d98e..629e86e98ab 100644
--- a/monitoring/datadog_event
+++ b/monitoring/datadog_event
@@ -133,6 +133,6 @@ def post_event(module):
     except socket.error, e:
         module.fail_json(msg="Socket error: %s to %s" % (e, uri))
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/monitoring/monit b/monitoring/monit
index 664e4d39cd4..32e3e058121 100644
--- a/monitoring/monit
+++ b/monitoring/monit
@@ -142,7 +142,7 @@ def main():
 
     module.exit_json(changed=False, name=name, state=state)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/monitoring/nagios b/monitoring/nagios
index 1f40efbf545..a66583b0c62 100644
--- a/monitoring/nagios
+++ b/monitoring/nagios
@@ -875,6 +875,6 @@ class Nagios(object):
                               changed=True)
 
 ######################################################################
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/monitoring/newrelic_deployment b/monitoring/newrelic_deployment
index c0d5c4beaae..de64651969c 100644
--- a/monitoring/newrelic_deployment
+++ b/monitoring/newrelic_deployment
@@ -156,7 +156,7 @@ def main():
         else:
             module.fail_json(msg="result code: %d" % result.code)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
 
diff --git a/net_infrastructure/dnsmadeeasy b/net_infrastructure/dnsmadeeasy
index a2ad7bb93cf..d4af13e884a 100644
--- a/net_infrastructure/dnsmadeeasy
+++ b/net_infrastructure/dnsmadeeasy
@@ -336,6 +336,6 @@ def main():
         module.fail_json(
             msg="'%s' is an unknown value for the state argument" % state)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/net_infrastructure/netscaler b/net_infrastructure/netscaler
index bb5df47f805..1aa370895d5 100644
--- a/net_infrastructure/netscaler
+++ b/net_infrastructure/netscaler
@@ -175,6 +175,6 @@ def main():
         module.exit_json(**result)
 
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/net_infrastructure/openvswitch_bridge b/net_infrastructure/openvswitch_bridge
index b45013f2872..9e8d521d39e 100644
--- a/net_infrastructure/openvswitch_bridge
+++ b/net_infrastructure/openvswitch_bridge
@@ -125,6 +125,6 @@ def main():
         br.run()
 
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/net_infrastructure/openvswitch_port b/net_infrastructure/openvswitch_port
index b8c454005f6..a33946e9a1b 100644
--- a/net_infrastructure/openvswitch_port
+++ b/net_infrastructure/openvswitch_port
@@ -129,6 +129,6 @@ def main():
         port.run()
 
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/network/get_url b/network/get_url
index f3351527b33..485a607ccc8 100644
--- a/network/get_url
+++ b/network/get_url
@@ -363,6 +363,6 @@ def main():
     module.exit_json(url=url, dest=dest, src=tmpsrc, md5sum=md5sum_src,
         sha256sum=sha256sum, changed=changed, msg=info.get('msg', ''))
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/network/slurp b/network/slurp
index a8a42443b82..744032c2cd6 100644
--- a/network/slurp
+++ b/network/slurp
@@ -68,7 +68,7 @@ def main():
 
     module.exit_json(content=data, encoding='base64')
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/network/uri b/network/uri
index 39a78cb8cc8..9a22d4758c8 100644
--- a/network/uri
+++ b/network/uri
@@ -420,6 +420,6 @@ def main():
         module.exit_json(changed=changed, **uresp)
 
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/notification/campfire b/notification/campfire
index 4b8795fd74a..9bdc78796a5 100644
--- a/notification/campfire
+++ b/notification/campfire
@@ -128,6 +128,6 @@ def main():
 
     module.exit_json(changed=True, room=room, msg=msg, notify=notify)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/notification/flowdock b/notification/flowdock
index 9a391714f7c..a5be40d1f10 100644
--- a/notification/flowdock
+++ b/notification/flowdock
@@ -194,7 +194,7 @@ def main():
 
     module.exit_json(changed=False, msg=module.params["msg"])
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
 
diff --git a/notification/grove b/notification/grove
index 6979d45b0f2..467f6962776 100644
--- a/notification/grove
+++ b/notification/grove
@@ -83,6 +83,6 @@ def main():
     # Mission complete
     module.exit_json(msg="OK")
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/notification/hipchat b/notification/hipchat
index 02c61c22eea..eec2b8c3618 100644
--- a/notification/hipchat
+++ b/notification/hipchat
@@ -139,6 +139,6 @@ def main():
     module.exit_json(changed=changed, room=room, msg_from=msg_from,
                      msg=msg)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/notification/irc b/notification/irc
index 92df1c98310..1948d54c0db 100644
--- a/notification/irc
+++ b/notification/irc
@@ -154,6 +154,6 @@ def main():
     module.exit_json(changed=False, channel=channel, nick=nick,
                      msg=msg)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/notification/jabber b/notification/jabber
index eb94d107aff..8a7eed37b33 100644
--- a/notification/jabber
+++ b/notification/jabber
@@ -141,6 +141,6 @@ def main():
 
     module.exit_json(changed=False, to=to, user=user, msg=msg.getBody())
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/notification/mail b/notification/mail
index 9f69447de97..56211c6807e 100644
--- a/notification/mail
+++ b/notification/mail
@@ -247,6 +247,6 @@ def main():
 
     module.exit_json(changed=False)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/notification/mqtt b/notification/mqtt
index 4f64c4b78ed..d00307018dc 100644
--- a/notification/mqtt
+++ b/notification/mqtt
@@ -175,6 +175,6 @@ def main():
 
     module.exit_json(changed=False, topic=topic)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/notification/osx_say b/notification/osx_say
index 98d559ab42a..8bde688349a 100644
--- a/notification/osx_say
+++ b/notification/osx_say
@@ -71,6 +71,6 @@ def main():
 
     module.exit_json(msg=msg, changed=False) 
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/packaging/apt b/packaging/apt
index a16912af958..829a689fc2e 100644
--- a/packaging/apt
+++ b/packaging/apt
@@ -434,7 +434,7 @@ def main():
     except apt.cache.LockFailedException:
         module.fail_json(msg="Failed to lock apt for exclusive operation")
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/packaging/apt_repository b/packaging/apt_repository
index 7e0fd1a0139..9965bc22a38 100644
--- a/packaging/apt_repository
+++ b/packaging/apt_repository
@@ -381,7 +381,7 @@ def main():
 
     module.exit_json(changed=changed, repo=repo, state=state)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/packaging/easy_install b/packaging/easy_install
index 9c542a22e1b..88f867dd285 100644
--- a/packaging/easy_install
+++ b/packaging/easy_install
@@ -179,7 +179,7 @@ def main():
     module.exit_json(changed=changed, binary=easy_install,
                      name=name, virtualenv=env)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/packaging/homebrew b/packaging/homebrew
index 0ff162db4c6..8801a4e6c4d 100644
--- a/packaging/homebrew
+++ b/packaging/homebrew
@@ -170,7 +170,7 @@ def main():
     elif p["state"] in ["absent", "removed"]:
         remove_packages(module, brew_path, pkgs)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/packaging/macports b/packaging/macports
index 898bdfbd889..b58224b63fe 100644
--- a/packaging/macports
+++ b/packaging/macports
@@ -209,7 +209,7 @@ def main():
     elif p["state"] == "inactive":
         deactivate_packages(module, port_path, pkgs)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/packaging/npm b/packaging/npm
index a8de161583d..0cdcf64c63b 100644
--- a/packaging/npm
+++ b/packaging/npm
@@ -223,6 +223,6 @@ def main():
 
     module.exit_json(changed=changed)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/packaging/openbsd_pkg b/packaging/openbsd_pkg
index f8db14de56f..7ce78497dc5 100644
--- a/packaging/openbsd_pkg
+++ b/packaging/openbsd_pkg
@@ -276,6 +276,6 @@ def main():
 
     module.exit_json(**result)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/packaging/opkg b/packaging/opkg
index 75c75ad0112..4a834cf1a39 100644
--- a/packaging/opkg
+++ b/packaging/opkg
@@ -143,7 +143,7 @@ def main():
     elif p["state"] in ["absent", "removed"]:
         remove_packages(module, opkg_path, pkgs)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/packaging/pacman b/packaging/pacman
index 9865ae752cc..1b495dd1807 100644
--- a/packaging/pacman
+++ b/packaging/pacman
@@ -212,7 +212,7 @@ def main():
     elif p["state"] == "absent":
         remove_packages(module, pkgs)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
     
 main()        
diff --git a/packaging/pip b/packaging/pip
index a862415ef56..13cf162fe15 100644
--- a/packaging/pip
+++ b/packaging/pip
@@ -346,7 +346,7 @@ def main():
     module.exit_json(changed=changed, cmd=cmd, name=name, version=version,
                      state=state, requirements=requirements, virtualenv=env, stdout=out, stderr=err)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/packaging/pkgin b/packaging/pkgin
index 1ff8897396f..0554cf9a216 100755
--- a/packaging/pkgin
+++ b/packaging/pkgin
@@ -162,7 +162,7 @@ def main():
     elif p["state"] == "absent":
         remove_packages(module, pkgin_path, pkgs)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/packaging/pkgng b/packaging/pkgng
index 8500a40f588..7b0468a7cbd 100644
--- a/packaging/pkgng
+++ b/packaging/pkgng
@@ -155,7 +155,7 @@ def main():
     elif p["state"] == "absent":
         remove_packages(module, pkgin_path, pkgs)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
     
 main()        
diff --git a/packaging/portinstall b/packaging/portinstall
index b83214aebd9..4bef8035be3 100644
--- a/packaging/portinstall
+++ b/packaging/portinstall
@@ -202,7 +202,7 @@ def main():
     elif p["state"] == "absent":
         remove_packages(module, pkgs)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/packaging/swdepot b/packaging/swdepot
index 230f6a5f0b0..6fd89088cc0 100644
--- a/packaging/swdepot
+++ b/packaging/swdepot
@@ -188,7 +188,7 @@ def main():
 
     module.exit_json(changed=changed, name=name, state=state, msg=msg)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/packaging/urpmi b/packaging/urpmi
index 8ce147f6e66..b001ed94dee 100644
--- a/packaging/urpmi
+++ b/packaging/urpmi
@@ -202,7 +202,7 @@ def main():
     elif p['state'] in [ 'removed', 'absent' ]:
         remove_packages(module, packages)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
     
 main()        
diff --git a/packaging/yum b/packaging/yum
index 08716a325b6..4c930f2f777 100644
--- a/packaging/yum
+++ b/packaging/yum
@@ -737,7 +737,7 @@ def main():
                      disablerepo, disable_gpg_check)
         module.fail_json(msg="we should never get here unless this all failed", **res)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
 
diff --git a/packaging/zypper b/packaging/zypper
index abe91d3e859..887ec108c68 100644
--- a/packaging/zypper
+++ b/packaging/zypper
@@ -224,6 +224,6 @@ def main():
 
     module.exit_json(**result)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/packaging/zypper_repository b/packaging/zypper_repository
index 9460660984e..f585d0bde2e 100644
--- a/packaging/zypper_repository
+++ b/packaging/zypper_repository
@@ -151,7 +151,7 @@ def main():
 
     module.exit_json(changed=changed, repo=repo, state=state)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/system/authorized_key b/system/authorized_key
index 33b880a5067..02f2db1320f 100644
--- a/system/authorized_key
+++ b/system/authorized_key
@@ -383,6 +383,6 @@ def main():
     results = enforce_state(module, module.params)
     module.exit_json(**results)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/system/facter b/system/facter
index 83d3f5afb7a..a72cdc6536f 100644
--- a/system/facter
+++ b/system/facter
@@ -49,7 +49,7 @@ def main():
     rc, out, err = module.run_command(cmd, check_rc=True)
     module.exit_json(**json.loads(out))
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/system/filesystem b/system/filesystem
index f85e602ae17..698c71d4534 100644
--- a/system/filesystem
+++ b/system/filesystem
@@ -107,6 +107,6 @@ def main():
 
     module.exit_json(changed=changed)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/system/kernel_blacklist b/system/kernel_blacklist
index 8966d8c153f..6af08c0788c 100644
--- a/system/kernel_blacklist
+++ b/system/kernel_blacklist
@@ -136,6 +136,6 @@ def main():
 
     module.exit_json(**args)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/system/lvg b/system/lvg
index 19e09a446c1..4e24b25a5c9 100644
--- a/system/lvg
+++ b/system/lvg
@@ -228,6 +228,6 @@ def main():
 
     module.exit_json(changed=changed)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/system/lvol b/system/lvol
index 06338b7df46..65e6f979859 100644
--- a/system/lvol
+++ b/system/lvol
@@ -205,6 +205,6 @@ def main():
 
     module.exit_json(changed=changed,msg=msg)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/system/modprobe b/system/modprobe
index c6eff44190e..80ec66d9b18 100755
--- a/system/modprobe
+++ b/system/modprobe
@@ -94,6 +94,6 @@ def main():
 
     module.exit_json(**args)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/system/mount b/system/mount
index 9696760a97b..a2e0dc84171 100644
--- a/system/mount
+++ b/system/mount
@@ -318,6 +318,6 @@ def main():
     module.fail_json(msg='Unexpected position reached')
     sys.exit(0)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/system/ohai b/system/ohai
index 19c87da7874..b50abc9db03 100644
--- a/system/ohai
+++ b/system/ohai
@@ -48,7 +48,7 @@ def main():
     rc, out, err = module.run_command(cmd, check_rc=True)
     module.exit_json(**json.loads(out))
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/system/open_iscsi b/system/open_iscsi
index afce585cd7e..2e57727cf59 100644
--- a/system/open_iscsi
+++ b/system/open_iscsi
@@ -370,7 +370,7 @@ def main():
 
 
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/system/setup b/system/setup
index ab84cbb5d90..7d69d22d834 100755
--- a/system/setup
+++ b/system/setup
@@ -2205,6 +2205,6 @@ def main():
     data = run_setup(module)
     module.exit_json(**data)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/system/sysctl b/system/sysctl
index cc3091f2a74..71320a3453c 100644
--- a/system/sysctl
+++ b/system/sysctl
@@ -339,6 +339,6 @@ def main():
     module.exit_json(changed=changed, **sysctl_args)
     sys.exit(0)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/utilities/accelerate b/utilities/accelerate
index 2c098c6571a..92bb1a7afed 100644
--- a/utilities/accelerate
+++ b/utilities/accelerate
@@ -450,6 +450,6 @@ def main():
 
     daemonize(module, password, port, timeout, minutes, ipv6)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/utilities/fireball b/utilities/fireball
index ff8c6b172d3..43760969a89 100644
--- a/utilities/fireball
+++ b/utilities/fireball
@@ -275,6 +275,6 @@ def main():
     daemonize(module, password, port, minutes)
 
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/utilities/wait_for b/utilities/wait_for
index a6b1d324f9e..bee2f003b6f 100644
--- a/utilities/wait_for
+++ b/utilities/wait_for
@@ -196,6 +196,6 @@ def main():
     elapsed = datetime.datetime.now() - start
     module.exit_json(state=state, port=port, search_regex=search_regex, path=path, elapsed=elapsed.seconds)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/web_infrastructure/django_manage b/web_infrastructure/django_manage
index ed31d33e3de..f6ea9c49149 100644
--- a/web_infrastructure/django_manage
+++ b/web_infrastructure/django_manage
@@ -273,7 +273,7 @@ def main():
     module.exit_json(changed=changed, out=out, cmd=cmd, app_path=app_path, virtualenv=virtualenv,
                      settings=module.params['settings'], pythonpath=module.params['pythonpath'])
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()
diff --git a/web_infrastructure/htpasswd b/web_infrastructure/htpasswd
index 6d130209faf..95d43bcd233 100644
--- a/web_infrastructure/htpasswd
+++ b/web_infrastructure/htpasswd
@@ -211,7 +211,7 @@ def main():
         module.fail_json(msg=str(e))
 
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 if __name__ == '__main__':
diff --git a/web_infrastructure/jboss b/web_infrastructure/jboss
index b936294bbcb..9478235698c 100644
--- a/web_infrastructure/jboss
+++ b/web_infrastructure/jboss
@@ -135,6 +135,6 @@ def main():
 
     module.exit_json(changed=changed)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 main()
diff --git a/web_infrastructure/supervisorctl b/web_infrastructure/supervisorctl
index b8586d2361b..564368af5f4 100644
--- a/web_infrastructure/supervisorctl
+++ b/web_infrastructure/supervisorctl
@@ -189,7 +189,7 @@ def main():
 
     module.exit_json(changed=False, name=name, state=state)
 
-# this is magic, see lib/ansible/module_common.py
+# import module snippets
 from ansible.module_utils.basic import *
 
 main()