fixing merge conflicts

Gemfile.lock

@@ -1,3 +1,11 @@
+GIT
+  remote: git://github.com/arunagw/omniauth-twitter.git
+  revision: b82964cf8f6071e770a64ba19408c3f22701267f
+  specs:
+    omniauth-twitter (1.4.0)
+      omniauth-oauth (~> 1.1)
+      rack
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -38,7 +46,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     arel (6.0.4)
-    autoprefixer-rails (6.7.7.2)
+    autoprefixer-rails (7.1.1)
       execjs
     bcrypt (3.1.11)
     binding_of_caller (0.7.2)
@@ -64,7 +72,7 @@ GEM
     closure_tree (6.5.0)
       activerecord (>= 4.1.0)
       with_advisory_lock (>= 3.0.0)
-    cocoon (1.2.9)
+    cocoon (1.2.10)
     coderay (1.1.1)
     coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
@@ -74,11 +82,11 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.0.5)
-    debug_inspector (0.0.2)
-    devise (4.2.1)
+    debug_inspector (0.0.3)
+    devise (4.3.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.1)
+      railties (>= 4.1.0, < 5.2)
       responders
       warden (~> 1.2.3)
     elasticsearch (5.0.4)
@@ -90,7 +98,7 @@ GEM
       faraday
       multi_json
     erubis (2.7.0)
-    excon (0.55.0)
+    excon (0.56.0)
     execjs (2.7.0)
     faraday (0.11.0)
       multipart-post (>= 1.2, < 3)
@@ -150,7 +158,7 @@ GEM
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-core (1.43.0)
+    fog-core (1.44.3)
       builder
       excon (~> 0.49)
       formatador (~> 0.2)
@@ -170,7 +178,7 @@ GEM
       multi_json (~> 1.10)
     fog-local (0.3.1)
       fog-core (~> 1.27)
-    fog-openstack (0.1.20)
+    fog-openstack (0.1.21)
       fog-core (>= 1.40)
       fog-json (>= 1.0)
       ipaddress (>= 0.8)
@@ -181,7 +189,7 @@ GEM
     fog-profitbricks (3.0.0)
       fog-core (~> 1.42)
       fog-json (~> 1.0)
-    fog-rackspace (0.1.4)
+    fog-rackspace (0.1.5)
       fog-core (>= 1.35)
       fog-json (>= 1.0)
       fog-xml (>= 0.1)
@@ -215,7 +223,7 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (1.9.1)
+    fog-vsphere (1.10.0)
       fog-core
       rbvmomi (~> 1.9)
     fog-xenserver (0.3.0)
@@ -242,13 +250,15 @@ GEM
     guard-minitest (2.4.6)
       guard-compat (~> 1.2)
       minitest (>= 3.0)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
     hashie (3.5.5)
-    i18n (0.8.1)
+    i18n (0.8.4)
     inflecto (0.0.2)
     ipaddress (0.8.3)
-    jbuilder (2.6.3)
-      activesupport (>= 3.0.0, < 5.2)
-      multi_json (~> 1.2)
+    jbuilder (2.7.0)
+      activesupport (>= 4.2.0)
+      multi_json (>= 1.2)
     jquery-rails (4.3.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -263,6 +273,7 @@ GEM
       ruby_dep (~> 1.2)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
+    mail (2.6.5)
     lumberjack (1.0.12)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
@@ -274,15 +285,18 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_magick (4.7.0)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    mini_portile2 (2.2.0)
+    minitest (5.10.2)
     morrisjs-rails (0.5.1.2)
       railties (> 3.1, < 6)
     multi_json (1.12.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     nenv (0.3.0)
     net-ssh (3.2.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
+    oauth (0.5.3)
     nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
     notiffany (0.1.1)
@@ -308,16 +322,13 @@ GEM
     omniauth-oauth2 (1.4.0)
       oauth2 (~> 1.0)
       omniauth (~> 1.2)
-    omniauth-twitter (1.4.0)
-      omniauth-oauth (~> 1.1)
-      rack
     orm_adapter (0.5.0)
     pg (0.20.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.6.5)
+    rack (1.6.8)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.2.5)
@@ -353,6 +364,7 @@ GEM
     ranked-model (0.4.0)
       activerecord (>= 3.1.12)
     raphael-rails (2.1.2)
+    rbvmomi (1.11.2)
     rb-fsevent (0.9.8)
     rb-inotify (0.9.8)
       ffi (>= 0.5.0)
@@ -362,6 +374,10 @@ GEM
       nokogiri (~> 1.5)
       trollop (~> 2.1)
     rdoc (4.3.0)
+    responders (2.4.0)
+      actionpack (>= 4.2.0, < 5.3)
+      railties (>= 4.2.0, < 5.3)
+    sass (3.4.24)
     responders (2.3.0)
       railties (>= 4.2.0, < 5.1)
     ruby_dep (1.5.0)
@@ -375,17 +391,22 @@ GEM
     sdoc (0.4.2)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
-    searchkick (2.2.0)
+    searchkick (2.3.0)
       activemodel (>= 4.1)
       elasticsearch (>= 1)
       hashie
+    simple_form (3.5.0)
+      actionpack (> 4, < 5.2)
+      activemodel (> 4, < 5.2)
     shellany (0.0.1)
     simple_form (3.4.0)
       actionpack (> 4, < 5.1)
       activemodel (> 4, < 5.1)
     slop (3.6.0)
-    social-share-button (0.1.10)
+    social-share-button (0.10.0)
       coffee-rails
+    spring (2.0.2)
+      activesupport (>= 4.2)
       sass-rails
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
@@ -401,7 +422,7 @@ GEM
     trollop (2.1.2)
     turbolinks (5.0.1)
       turbolinks-source (~> 5)
-    turbolinks-source (5.0.0)
+    turbolinks-source (5.0.3)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
     uglifier (3.2.0)
@@ -451,7 +472,7 @@ DEPENDENCIES
   omniauth
   omniauth-facebook
   omniauth-linkedin
-  omniauth-twitter
+  omniauth-twitter!
   pg
   pry
   rails (= 4.2.5)

config/initializers/devise.rb

@@ -247,7 +247,7 @@
   # ==> OmniAuth
   # Add a new OmniAuth provider. Check the wiki for more information on setting
   # up on your models and hooks.
-  config.omniauth :twitter, ENV['TWITTER_KEY'], ENV['SECRET']
+  config.omniauth :twitter, 'TWITTER_KEY', 'TWITTER_SECRET'
   config.omniauth :facebook, ENV["FACEBOOK_KEY"], ENV["SECRET1"], callback_url: "https://cloned-atwellj.c9users.io/users/auth/facebook/callback"
   # config.omniauth :linked_in, "KEY", "SECRET"
   # ==> Warden configuration