Merge branch 'master' into updates

SECURITY.md

@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+If you find a vulnerability, please do not open a github issue. Please contact board@doubleunion.org and/or membership@doubeunion.org and we will get back to you with an update within a week.

app/views/admin/new_members.html.haml

@@ -1,9 +1,10 @@
 %h1 New DU Members
 .instructions
   %ul
-    %li Add all new members directly to the #{ link_to "members mailing list", "https://groups.google.com/a/doubleunion.org/forum/#!forum/members"}.
-    %li Then, if they've set up dues, give the member access to the DU Members Google #{ link_to "drive folder", "https://drive.google.com/#folders/0B6a_aDP-2fOVV2FQLW5FVTZ2Mjg", target: "_blank" } & #{ link_to "calendar", "https://www.google.com/calendar/render", target: "_blank" } and to the #{ link_to "DU Members Slack", "https://doubleunion.slack.com/admin", target: "_blank" }.
-    %li Clicking the Setup Finished button will sent the member an email letting them know they have access to the Google docs & calendar now.
+    %li Log in as the membership coordinator gmail user. Add all new members directly to the #{ link_to "members mailing list", "https://groups.google.com/a/doubleunion.org/forum/#!forum/members"}.
+    %li Being a member of the mailing list will give them access to the DU Members Google #{ link_to "drive folder", "https://drive.google.com/#folders/0B6a_aDP-2fOVV2FQLW5FVTZ2Mjg", target: "_blank" } & #{ link_to "calendar", "https://www.google.com/calendar/render", target: "_blank" }
+    %li Add the new members to the #{ link_to "DU Members Slack", "https://doubleunion.slack.com/admin", target: "_blank" }.
+    %li Clicking the Setup Finished button will sent the member an email letting them know they have access to the Google docs & calendar now, and stop them from getting the "Account Setup Needed" emails
 
   %p Don't forget to save each note individually so you don't lose your work.