Merge remote branch 'origin' into devel

Conflicts:
	library/web_infrastructure/django_manage

library/files/file

@@ -42,7 +42,7 @@ options:
       - defines the file being managed, unless when used with C(state=link), and then sets the destination to create a symbolic link to using I(src)
     required: true
     default: []
-    aliases: []
+    aliases: ['dest', 'name'] 
   state:
     description:
       - If C(directory), all immediate subdirectories will be created if they

library/system/setup

@@ -365,6 +365,8 @@ class Facts(object):
         self.facts['date_time']['minute'] = now.strftime('%M')
         self.facts['date_time']['second'] = now.strftime('%S')
         self.facts['date_time']['epoch'] = now.strftime('%s')
+        if self.facts['date_time']['epoch'][0] == '%':
+            self.facts['date_time']['epoch'] = str(int(time.time()))
         self.facts['date_time']['date'] = now.strftime('%Y-%m-%d')
         self.facts['date_time']['time'] = now.strftime('%H:%M:%S')
         self.facts['date_time']['iso8601_micro'] = now.utcnow().strftime("%Y-%m-%dT%H:%M:%S.%fZ")

library/web_infrastructure/django_manage

@@ -71,7 +71,7 @@ options:
       - A space-delimited list of fixture file names to load in the database. B(Required) by the 'loaddata' command.
     required: false
 notes:
-   - U(http://www.virtualenv.org/, virtualenv) must be installed on the remote host if the virtualenv parameter is specified.
+   - I(virtualenv) (U(http://www.virtualenv.org)) must be installed on the remote host if the virtualenv parameter is specified.
    - This module will create a virtualenv if the virtualenv parameter is specified and a virtualenv does not already exist at the given location.
    - This module assumes English error messages for the 'createcachetable' command to detect table existence, unfortunately.
 requirements: [ "virtualenv", "django" ]
@@ -79,20 +79,19 @@ author: Scott Anderson
 '''
 
 EXAMPLES = """
-# Run cleanup on the application installed in '$django_dir'.
-- django_manage: command=cleanup app_path=$django_dir
+# Run cleanup on the application installed in 'django_dir'.
+- django_manage: command=cleanup app_path={{ django_dir }}
 
-# Load the $initial_data fixture into the application
-- django_manage: command=loaddata app_path=$django_dir fixtures=$initial_data
+# Load the initial_data fixture into the application
+- django_manage: command=loaddata app_path={{ django_dir }} fixtures={{ initial_data }}
 
 #Run syncdb on the application
 - django_manage: >
       command=syncdb 
-      app_path=$django_dir 
-      settings=$settings_app_name 
-      pythonpath=$settings_dir 
-      virtualenv=$virtualenv_dir 
-      database=$mydb
+      app_path={{ django_dir }}
+      settings={{ settings_app_name }} 
+      pythonpath={{ settings_dir }}
+      virtualenv={{ virtualenv_dir }}
 
 #Run the SmokeTest test case from the main app. Useful for testing deploys.
 - django_manage: command=test app_path=django_dir apps=main.SmokeTest