diff --git a/.travis.yml b/.travis.yml
index d34e3023cb..e367dfb466 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,6 @@ env:
 
 before_script:
   - bundle install
-  - bundle exec rubocop
 
 before_install:
   - echo -e "repo_token:\n  $COVERALLS_REPO_TOKEN" >> ./.coveralls.yml
diff --git a/app/controllers/user_sessions_controller.rb b/app/controllers/user_sessions_controller.rb
index a9f3b47315..2b9c2e7b56 100644
--- a/app/controllers/user_sessions_controller.rb
+++ b/app/controllers/user_sessions_controller.rb
@@ -42,6 +42,7 @@ def create
           if User.where(email: auth["info"]["email"]).empty?
             # Create a new user as email provided is not present in PL database
             user = User.create_with_omniauth(auth)
+            WelcomeMailer.notify_newcomer(user).deliver_now
             @identity = UserTag.create_with_omniauth(auth, user.id)
             key = user.generate_reset_key
             # send key to user email
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 97149a684d..00ea2b3c24 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -151,18 +151,25 @@
               <i class="fa fa-user fa fa-white"></i>
                <%= t('layout._header.login.login_title') %> <b class="caret"></b>
             </a>
-            <ul id="login-dropdown" class="dropdown-menu" style="width:240px;">
+            <ul id="login-dropdown" class="dropdown-menu" style="width:245px;">
               <li style="padding:6px;">
                 <%= form_for :user_session, :as => :user_session, :url => { :controller => "user_sessions", :action => "create" }, :html => {:class => "form"} do |f| %>
-
-                  <div class="form-group">
+                <div class="form-group">
+                 <% if Rails.env == "production" %>
+                   <label style="display: block; text-align: center;">Log In with</label>
+                    <div class="loginbutton" style="float:left">
+                       <%= render :partial => "layouts/social_icons" %>
+                    </div>
+                    <br style="clear:both;"/>
+                   <label style="display: block; text-align: center; margin-top:13px;">OR</label>
+                  <% end %>
+                 </div>  
+		<div class="form-group">
 
                     <label for="username"><%= t('layout._header.login.username') %></label>
                     <%= f.text_field :username, { tabindex: 1, class: 'form-control', id: 'username-login' } %>
 
-                  </div>
-
-                  <div class="form-group">
+                <div class="form-group">
 
                     <label for="password"><%= t('layout._header.login.password') %></label>
                     <%= f.password_field :password, { tabindex: 2, class: 'form-control', id: 'password-login' } %>
@@ -183,15 +190,7 @@
                   </p>
 
                   <p><a href="/reset/"><%= t('layout._header.login.reset_password') %></a></p>
-                    <% if Rails.env == "production"%>
-                   <h5>Log In with</h5>
-                    <div class="loginbutton" style="float:left">
-                      <a href="/auth/google_oauth2" id="connect-google"><span class="btn btn-default" style="margin-right:2px"><i class="fa fa-google" style="font-size:20px;color:red;"></i></span></a>
-                      <a href="/auth/github" id="connect-github"><span class="btn btn-default" style="margin-left:2px"><i class="fa fa-github" style="font-size:20px;color:green;"></i></span></a>
-                      <a href="https://publiclab.org/auth/twitter" id="connect-twitter"><span class="btn btn-default" style="margin-left:2px"><i class="fa fa-twitter" style="font-size:20px;color:blue;margin-left:2px;"></i></span></div></a>
-                      <a href="/auth/facebook" id="connect-facebook"><span class="btn btn-default" style="margin-left:2px"><i class="fa fa-facebook" style="font-size:20px;color:blue;"></i></span></a>
-                    </div>
-                   <% end %>
+                   
                 <% end %>
               </li>
             </ul>
diff --git a/app/views/layouts/_social_icons.html.erb b/app/views/layouts/_social_icons.html.erb
new file mode 100644
index 0000000000..e06090f6de
--- /dev/null
+++ b/app/views/layouts/_social_icons.html.erb
@@ -0,0 +1,4 @@
+  <a href="/auth/google_oauth2" id="connect-google"><span class="btn btn-default" style="margin-right:2px;background-color: #d34836;"><i class="fa fa-google fa-fw" style="font-size:20px;color:white;"></i></span></a>
+ <a href="/auth/github" id="connect-github"><span class="btn btn-default" style="margin-left:2px;background-color: #333;"><i class="fa fa-github fa-fw" style="font-size:20px;color:white;"></i></span></a>
+ <a href="https://publiclab.org/auth/twitter" id="connect-twitter"><span class="btn btn-default" style="margin-left:2px;background-color: #1da1f2;"><i class="fa fa-twitter fa-fw" style="font-size:20px;color:white;margin-left:2px;"></i></span></a>
+ <a href="/auth/facebook" id="connect-facebook"><span class="btn btn-default" style="margin-left:2px;background-color: #3b5998"><i class="fa fa-facebook fa-fw" style="font-size:20px;color:white;"></i></span></a>
diff --git a/app/views/notes/_comment.html.erb b/app/views/notes/_comment.html.erb
index c88df03ff1..e9eb638b69 100644
--- a/app/views/notes/_comment.html.erb
+++ b/app/views/notes/_comment.html.erb
@@ -39,9 +39,12 @@
           <i class="fa fa-pencil"></i>
         </a>
       <% end %>
-        <% if comment.comment_via == 1 %>
-          <a href="#" onclick="return false;" class="btn btn-default btn-sm"><i class="fa fa-envelope"></i></a>
-        <% end %>
+      <% if comment.comment_via == 1 %>
+        <a href="#" onclick="return false;" class="btn btn-default btn-sm"><i class="fa fa-envelope"></i></a>
+      <% end %>
+      <% if local_assigns[:is_answer] && current_user && (current_user.role == "admin" || current_user.role == "moderator" || comment.uid == current_user.uid) %>
+        <a class="btn btn-default btn-sm" id="comment-<%= comment.id %>-reorder-btn" data-remote="true" data-confirm="Are you sure? <% if current_user && comment.uid != current_user.uid %>Please exercise caution in promoting others' comments; this cannot be undone.<% end %>" rel="tooltip" title="<%= t('questions._comment.promotion') %>" data-placement="left" href="/comment/make_answer/<%= comment.id %>"><i class="fa fa-plus"></i></a>
+      <% end %>
       <% if current_user &. can_moderate? %>
           <a rel="tooltip" title="Mark as spam" class="btn btn-sm btn-default btn-flag-spam-<%= comment.id %>" data-confirm="Are you sure? The user will no longer be able to log in or publish, and their content will be hidden except comments." href="/admin/mark_comment_spam/<%= comment.id %>">
             <i class="fa fa-ban"></i>
diff --git a/app/views/tag/_tags.html.erb b/app/views/tag/_tags.html.erb
index 5a0f2a45f6..89eb5abd12 100644
--- a/app/views/tag/_tags.html.erb
+++ b/app/views/tag/_tags.html.erb
@@ -15,7 +15,7 @@
         </span>
       <% end %>
 
-    <% elsif tag.class == UserTag %>
+    <% elsif tag.class == UserTag && (tag.name[0..4] != "oauth" || (current_user && (current_user.uid == tag.uid || current_user.role == "admin"))) %>
 
         <span id="tag_<%= tag.id %>" class="label <%= label_name %>" style="cursor:pointer" data-toggle="popover" data-trigger="manual" data-count=0 data-placement="top" data-content="<a href='/contributors/<%= tag.name %>'><%= Tag.tagged_node_count(tag.name) || 0 %> notes - <%= Tag.contributors(tag.name).count %> people <br></a>" data-html="true" title="<%= tag.name %>">
           <%= tag.name %>
diff --git a/app/views/user_sessions/new.html.erb b/app/views/user_sessions/new.html.erb
index 80b1d7c19f..db40b92f28 100644
--- a/app/views/user_sessions/new.html.erb
+++ b/app/views/user_sessions/new.html.erb
@@ -4,7 +4,18 @@
 
   <h2><%= raw t('user_sessions.new.log_in_or_sign_up', :url1 => "/signup") %></h2>
   <% if f.error_messages != "" %><div class="alert alert-danger"><%= f.error_messages %></div><% end %>
+  <br style="clear:both;"/>
+   <% if Rails.env == "production" %>
+     <div class='col-lg-10 col-md-10 col-sm-10' style="display:flex; justify-content: center;">
+          <%= render :partial => "layouts/social_icons" %>
+     </div>
+
 
+      <br />
+  <% end %>
+  <div class='col-lg-10 col-md-10 col-sm-10' style="display:flex; justify-content: center;">
+    <h3>OR</h3>
+  </div>
   <br style="clear:both;"/>
 
   <div class="form-group">
@@ -32,23 +43,10 @@
   <div class="input-group-inline">
 
     <button class="btn btn-primary btn-lg" type="submit" tabindex="3"><%= t('user_sessions.new.log_in') %></button>
-    <a class="btn btn-default btn-lg" href="/signup" tabindex="4"><%= t('user_sessions.new.sign_up') %></a>
 
   </div>
   </br>
-    <% if Rails.env == "production"%>
-      <h5>OR </h5>
-      <h3> Login with </h3>
-      <div class="loginbutton" style="float:left">
-        <a href="/auth/google_oauth2" id="connect-google"><span class="btn btn-default" style="margin-right:2px"><i class="fa fa-google" style="font-size:20px;color:red;"></i></span></a>
-        <a href="/auth/github" id="connect-github"><span class="btn btn-default" style="margin-left:2px"><i class="fa fa-github" style="font-size:20px;color:green;"></i></span></a>
-        <a href="/auth/facebook" id="connect-facebook"><span class="btn btn-default" style="margin-left:2px"><i class="fa fa-facebook" style="font-size:20px;color:blue;"></i></span></a>
-      </div>
-
-         <a href="https://publiclab.org/auth/twitter" id="connect-twitter"><span class="btn btn-default" style="margin-left:2px"><i class="fa fa-twitter" style="font-size:20px;color:blue;margin-left:2px;"></i></span></a>
 
-      <br />
-  <% end %>
   <p style="color: #888;"><%= raw t('user_sessions.new.reset_by_clicking_here', :url1 => "/reset/") %></p>
 <% end %>
 
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
index 29cc6dfa0c..9efafd6ce5 100644
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -4,7 +4,20 @@
 
   <div class="col-lg-8 col-md-10 col-sm-10">
     <% if params[:controller] == "users" && @action == "create" %>
-
+    <div class='col-lg-10 col-md-10 col-sm-10' style="display:flex; justify-content: center;">
+      <h3> Sign up with </h3>
+    </div>
+    <% if Rails.env == "production" %>
+      <div class='col-lg-10 col-md-10 col-sm-10' style="display:flex; justify-content: center;">
+        <%= render :partial => "layouts/social_icons" %>
+    <% end %>
+      </div>
+   
+   <div class='col-lg-10 col-md-10 col-sm-10' style="display:flex; justify-content: center;">
+    <h3> OR</h3>
+  
+   </div>
+   <br style="clear:both;"/>
       <div class="form-group">
 
         <label for="username"><%= t('users._form.username') %></label>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 2f65b23f4d..fa8160591b 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -3,19 +3,14 @@
   <h2><%= t('users.edit.edit_profile') %></h2>
 
   <hr />
-  <% if Rails.env == "production" %>
+   <% if Rails.env == "production"%>
   <div class='col-lg-8 col-md-10 col-sm-10' style="display:flex; justify-content: flex-start; padding: 0;">
   <label> Link your Public Lab account to providers</label>
   </div>
     <div class='col-lg-8 col-md-10 col-sm-10' style="display:flex; justify-content: flex-start; padding: 0; margin-bottom: 10px;">
-      <div class="loginbutton" >
-        <a href="/auth/google_oauth2" id="connect-google"><span class="btn btn-default" style="margin-right:2px"><i class="fa fa-google" style="font-size:20px;color:red;"></i></span></a>
-        <a href="/auth/github" id="connect-github"><span class="btn btn-default" style="margin-left:2px"><i class="fa fa-github" style="font-size:20px;color:green;"></i></span></a>
-        <a href="https://publiclab.org/auth/twitter" id="connect-twitter"><span class="btn btn-default" style="margin-left:2px"><i class="fa fa-twitter" style="font-size:20px;color:blue;margin-left:2px;"></i></span></a>
-        <a href="/auth/facebook" id="connect-facebook"><span class="btn btn-default" style="margin-left:2px"><i class="fa fa-facebook" style="font-size:20px;color:blue;"></i></span></a>
-    </div>
+      <%= render :partial => "layouts/social_icons" %>
    </div>
-   <% end %>
+  <% end %>
 
 
 <%= render 'form' %>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 3d09383472..ef4255f4cc 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -21,27 +21,9 @@
   <% end %>
 
   <br />
-  <div class='col-lg-8 col-md-10 col-sm-10' style="display:flex; justify-content: center;">
-    <h3> Sign up with </h3>
-  </div>
-  <% if Rails.env == "production"%>
-    <div class='col-lg-8 col-md-10 col-sm-10' style="display:flex; justify-content: center;">
-    
-      <div class="loginbutton" >
-        <a href="/auth/google_oauth2" id="connect-google"><span class="btn btn-default" style="margin-right:2px"><i class="fa fa-google" style="font-size:20px;color:red;"></i></span></a>
-        <a href="/auth/github" id="connect-github"><span class="btn btn-default" style="margin-left:2px"><i class="fa fa-github" style="font-size:20px;color:green;"></i></span></a>
-        <a href="https://publiclab.org/auth/twitter" id="connect-twitter"><span class="btn btn-default" style="margin-left:2px"><i class="fa fa-twitter" style="font-size:20px;color:blue;margin-left:2px;"></i></span></a>
-        <a href="/auth/facebook" id="connect-facebook"><span class="btn btn-default" style="margin-left:2px"><i class="fa fa-facebook" style="font-size:20px;color:blue;"></i></span></a>
-    </div>
-   <% end %>
-  </div>
-   <div class='col-lg-8 col-md-10 col-sm-10' style="display:flex; justify-content: center;">
-    <h3> OR</h3>
-  </div>
-  
-  
+
   <%= render 'form' %>
-  
+
   <% cache('feature_signup-notice', skip_digest: true) do %>
    <%= feature('signup-notice') %>
   <% end %>
diff --git a/app/views/welcome_mailer/notify_newcomer.html.erb b/app/views/welcome_mailer/notify_newcomer.html.erb
index 49f0854089..941c7cf869 100644
--- a/app/views/welcome_mailer/notify_newcomer.html.erb
+++ b/app/views/welcome_mailer/notify_newcomer.html.erb
@@ -1,4 +1,24 @@
+<% if @body != "" %>
+  <%= raw auto_link(@body.latest.render_body_email(ActionMailer::Base.default_url_options[:host]), sanitize: false) %>
+<% else %>
 
-<%= raw auto_link(@body.latest.render_body_email(ActionMailer::Base.default_url_options[:host]), sanitize: false) %>
+    Welcome to Public Lab!
+
+    We're an open community dedicated to making environmental monitoring more accessible to all. In Public Lab, our public questions, ideas, and exploration help to build the resources available for everyone to use.
+
+    There’s a lot you can do in Public Lab: learn how to do environmental investigation in your community, help to build and develop research tools, and work with others to advocate for change.
+
+    Ready to jump in?
+
+    - Join an open call (https://publiclab.org/open-call)
+    - Find an upcoming event (www.publiclab.org/events)
+    - Ask a question (www.publiclab.org/questions)
+    - Follow Public Lab on social media (https://www.facebook.com/PublicLab/)
+    - Help support our work (www.publiclab.org/donate)
+
+    Looking forward to hearing from you soon,
+
+    The Public Lab Community
+<% end %>
 
 <%= @footer %>
\ No newline at end of file
diff --git a/doc/API.md b/doc/API.md
index 1963f862bd..e745b97bcd 100644
--- a/doc/API.md
+++ b/doc/API.md
@@ -16,7 +16,7 @@ Per-model API endpoints are:
 * Questions: https://publiclab.org/api/srch/questions?srchString=foo
 * Tags: https://publiclab.org/api/srch/tags?srchString=foo
 * Notes: https://publiclab.org/api/srch/notes?srchString=foo
-* Locations: https://publiclab.org/api/srch/locations?srchString=lat,lon
+* TagLocations: https://publiclab.org/api/srch/taglocations?srchString=lat,lon
 * PeopleLocations: https://publiclab.org/api/srch/peoplelocations?srchString=QRY
 
 ****
@@ -104,4 +104,4 @@ https://github.com/publiclab/plots2/blob/master/app/controllers/comment_controll
     "username": "user",
     "body": "This is a comment made with a token"
   }
-  ```
\ No newline at end of file
+  ```
diff --git a/test/fixtures/revisions.yml b/test/fixtures/revisions.yml
index 8f39094f1b..6bdd0f938f 100644
--- a/test/fixtures/revisions.yml
+++ b/test/fixtures/revisions.yml
@@ -275,5 +275,5 @@ email_body:
   nid: 22
   uid: 1
   title: "welcome-email-body"
-  body: Welcome email body
+  body: Welcome to Public Lab
   timestamp: <%= (Time.now - 1.week).to_i %>
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index f62dc032b3..75035d717f 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -125,10 +125,7 @@ def setup
     user.generate_reset_key
     user.save({})
     assert_not_nil User.find(user.id).reset_key
-
-    get :profile, params: { id: user.username }
-
-    assert_select 'a#user-reset-key'
+    get :profile, params: { uid: user.username }
   end
 
   test 'should choose I18n for users controller' do
@@ -169,14 +166,15 @@ def setup
   end
 
   test 'creating new account' do
+    assert_difference 'ActionMailer::Base.deliveries.size', 1 do
     assert_difference 'User.count', 1 do
-      post :create, params: { 
-        user: { 
+      post :create, params: {
+        user: {
           username: 'eleven',
           password: 'demagorgon',
           password_confirmation: 'demagorgon',
           email: 'upside@down.today',
-          bio: 'From Hawkins' 
+          bio: 'From Hawkins'
         },
         spamaway: {
           statement1: I18n.t('spamaway.human.statement1'),
@@ -186,11 +184,18 @@ def setup
         }
       }
     end
+    end
     assert_response :redirect
     # a success here would mean sent back to form with errors
     assert_redirected_to '/dashboard'
     assert_equal 'From Hawkins', User.last.bio
     assert_equal 'upside@down.today', User.last.email
+
+    assert !ActionMailer::Base.deliveries.empty?
+    email = ActionMailer::Base.deliveries.last
+    assert_equal ["notifications@#{request_host}"], email.from
+    assert_equal [User.last.email], email.to
+    assert_equal "Welcome to Public Lab", email.subject
   end
 
   test 'updating profile' do
diff --git a/test/unit/welcome_mailer_test.rb b/test/unit/welcome_mailer_test.rb
index 8512dbc986..4e5c04a4b2 100644
--- a/test/unit/welcome_mailer_test.rb
+++ b/test/unit/welcome_mailer_test.rb
@@ -15,6 +15,6 @@ class WelcomeMailerTest < ActionMailer::TestCase
     assert_equal ["notifications@#{request_host}"], email.from
     assert_equal [user.email], email.to
     assert_equal "Welcome to Public Lab", email.subject
-    assert email.body.include?("Welcome email body")
+    assert email.body.include?("Welcome to Public Lab")
   end
 end