Merging master in to hash out auhty button.

Merge branch 'master' of github.com:APTrust/registry

views/users/choose_second_factor.html

@@ -26,7 +26,7 @@ <h2>Multi-Factor Authentication Required</h2>
     <p class="mb-3">How would you like to complete your login?</p>
 
     <div class="two-factor-option mb-3">
-      <button class="button is-primary" onclick="submitSecondFactor('authy')">Authy</button>
+      <button class="button is-primary" onclick="submitSecondFactor('authy')" disabled title="Authy is temporarily not available. APTrust is working to resolve this issue.">Authy</button>
       <article id="two-factor-method-authy" class="message is-info mt-4 two-factor-message" style="display:none">
         <div class="message-body">Sent push notification.</div>
       </article>