diff --git a/admin/.gitignore b/admin/.gitignore
index d70c888de..d747d53e8 100644
--- a/admin/.gitignore
+++ b/admin/.gitignore
@@ -21,3 +21,4 @@ artifacts
 .idea
 BUILD_NUMBER
 # Gemfile.lock
+Gemfile.alt.lock
diff --git a/admin/Gemfile b/admin/Gemfile
index b9099a250..a5dd3519b 100644
--- a/admin/Gemfile
+++ b/admin/Gemfile
@@ -94,7 +94,12 @@ gem 'eventmachine', '1.2.3'
 gem 'amqp', '0.9.8'
 #gem 'logging-rails', :require => 'logging/rails'
 #gem 'pg_migrate', '0.1.14'
-gem 'pg', '0.17.1', :platform => [:mri, :mswin, :mingw]
+if ENV["MODERN_OS"] == "1"
+  gem 'pg', '0.21.0'
+else
+  # on mac, bundle config build.pg --with-cflags="-Wno-error=implicit-function-declaration"
+  gem 'pg', '0.17.1', :platform => [:mri, :mswin, :mingw]
+end
 gem 'ruby-protocol-buffers', '1.2.2'
 gem 'sendgrid', '1.2.0'
 gem 'geokit-rails'
diff --git a/admin/Gemfile.alt b/admin/Gemfile.alt
new file mode 100644
index 000000000..a5dd3519b
--- /dev/null
+++ b/admin/Gemfile.alt
@@ -0,0 +1,172 @@
+source 'http://rubygems.org'
+
+source 'https://jamjam:blueberryjam@int.jamkazam.com/gems/'
+ruby_version = ENV["JAM_RUBY_VERSION"]
+ruby_version = "2.3.1" if ruby_version.nil?
+
+ruby ruby_version
+
+devenv = ENV["BUILD_NUMBER"].nil?
+
+if devenv
+  #gem 'jam_db', :path=> "../db/target/ruby_package"
+  gem 'jampb', :path => "../pb/target/ruby/jampb"
+  gem 'jam_ruby', :path => "../ruby"
+else
+  source 'https://jamjam:blueberryjam@int.jamkazam.com/gems/' do
+    #gem 'jam_db', "0.1.#{ENV["BUILD_NUMBER"]}"
+    gem 'jampb',  "0.1.#{ENV["BUILD_NUMBER"]}"
+    gem 'jam_ruby',  "0.1.#{ENV["BUILD_NUMBER"]}"
+    ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true"
+  end
+end
+
+gem 'activeadmin_addons'
+gem 'json', '1.8.6'
+gem 'rails', '= 4.2.8'
+gem 'protected_attributes'
+gem 'rails-observers'
+
+
+# PINNED TO SUPPORT BOTH 2.3.1 and 2.4.1 Ruby simultaneously
+# This should be the same in ruby/admin/web/websocket-gateway
+#######
+gem 'nokogiri', '1.10.10' # added to pin before 1.11.0, which requires at leaost ruby 2.5.  unpin we go above
+gem 'sprockets', '3.6.3' # added to pin before 4.0.0, which requiurse at least ruby 2.5
+gem 'fog-brightbox', '0.11.0' # pinned until we are on ruby 2.5; then remove
+gem 'faraday', '0.9.2' # pinned untnil we are on ruby 2.5; then remove
+gem 'ruby-prof', '0.15.9' # pinned until we are on ruby 2.5; then remove
+gem 'rubyzip', '1.2.1'  # pinned until we are on ruby 2.5; then remove
+gem 'recurly', '2.18.16' # should upgrade to 3.x when we have time to validaate
+gem 'icalendar', '2.4.0' # pinned until we are on ruby 2.5; then remove
+gem 'email_validator', '1.6.0' # pinned until we are on ruby 2.5, then remove
+gem 'redis', '3.3.3' # pinned until we are on 2.5; then remove
+gem 'redis-namespace', '1.5.3' # pinned until we are on 2.5; then remove
+gem 'oj', '3.1.3' # pinned until we are on 2.5; then remove
+gem 'bcrypt', '3.1.15'
+gem 'sass-rails', '5.0.7' # compiler mismatch issue between build and www
+gem 'sass', '3.5.5 '# compiler mismatch issue between build and www
+#######
+
+gem 'bootstrap-sass', '2.0.4'
+
+gem 'coffee-rails' #, '~> 3.2.1'
+
+# See https://github.com/sstephenson/execjs#readme for more supported runtimes
+# gem 'therubyracer', :platforms => :ruby
+
+gem 'kickbox'
+gem 'uglifier' #, '>= 1.0.3'
+gem 'net-ssh'
+gem 'sprockets-rails', '2.3.2'
+
+# this version is pinned due to this: https://github.com/gregbell/active_admin/issues/1939
+gem 'coffee-script-source' #, '~> 1.4.0' # ADD THIS LINE, 1.5.0 doesn't compile ActiveAdmin JavaScript files
+gem 'devise' #, '3.3.0'
+gem 'will_paginate' #, '3.0.3'
+gem 'bootstrap-will_paginate', '0.0.6'
+gem 'carrierwave', '0.11.2' #, '0.9.0'
+gem 'carrierwave_direct'
+gem 'uuidtools', '2.1.2'
+gem 'jquery-ui-rails'# , '5.0.5' #, '4.2.1'
+gem 'jquery-rails'# , '4.1.1'  # both this and jquery-ui-rails are pinned; if you unpin, jquery/autocomplete is missing during precomplie
+gem 'rails-jquery-autocomplete' # This is the maintained version of rails3-jquery-autocomplete
+gem 'activeadmin' #, '1.0.0.pre4'# github: 'activeadmin', branch: 'master'
+gem 'activeadmin-searchable_select'
+gem 'mime-types', '1.25'
+#gem 'meta_search'
+gem 'fog'
+gem 'xmlrpc'
+gem 'unf', '0.1.3' #optional fog dependency
+gem 'country-select'
+gem 'aasm' #, '3.0.16'
+gem 'postgres-copy', '0.6.0'
+gem 'aws-sdk', '~> 1'
+gem 'bugsnag', '5.3.2'
+gem 'gon'
+gem 'cocoon'
+gem 'haml-rails'
+gem 'resque'
+gem 'resque-retry'
+gem 'resque-failed-job-mailer'
+gem 'resque-lonely_job', '~> 1.0.0'
+gem 'eventmachine', '1.2.3'
+gem 'amqp', '0.9.8'
+#gem 'logging-rails', :require => 'logging/rails'
+#gem 'pg_migrate', '0.1.14'
+if ENV["MODERN_OS"] == "1"
+  gem 'pg', '0.21.0'
+else
+  # on mac, bundle config build.pg --with-cflags="-Wno-error=implicit-function-declaration"
+  gem 'pg', '0.17.1', :platform => [:mri, :mswin, :mingw]
+end
+gem 'ruby-protocol-buffers', '1.2.2'
+gem 'sendgrid', '1.2.0'
+gem 'geokit-rails'
+gem 'postgres_ext' #, '1.0.0'
+gem 'resque_mailer'
+gem 'rest-client'
+gem 'iso-639'
+gem 'sanitize'
+gem 'slim'
+#gem 'influxdb', '0.1.8'
+#gem 'influxdb-rails', '0.1.10'
+gem 'influxdb', '0.3.14'
+gem 'influxdb-rails', '0.1.12'
+gem 'sendgrid_toolkit', '>= 1.1.1'
+gem 'stripe'
+gem 'zip-codes'
+gem 'best_in_place' #, github: 'bernat/best_in_place'
+gem 'auto_strip_attributes', '2.6.0'
+gem 'elasticsearch'
+
+gem 'logging', '1.7.2'
+
+#group :libv8 do
+#  gem 'libv8', "~> 4.5.95"
+#end
+
+
+# To use Jbuilder templates for JSON
+# gem 'jbuilder'
+
+group :production do
+  gem 'unicorn'
+end
+
+group :package do
+   gem 'fpm'
+end
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+# To use debugger
+#gem 'debugger'  # not working with 2.1.2p95
+
+group :development, :test do
+  gem 'capybara', '2.13.0'
+  gem 'rspec-rails' #, '2.14.2'
+  gem 'jasmine', '1.3.1' 
+  gem 'execjs', '1.4.0'
+  #gem 'therubyracer' #, '0.11.0beta8'
+  gem 'factory_girl_rails' # , '4.1.0'
+  gem 'database_cleaner' #, '0.7.0'
+  gem 'launchy', '2.4.3' # can unpin when go to ruby 2.4+
+  gem 'faker', '1.3.0'
+  gem 'puma'
+  gem 'test-unit'
+end
+
+group :test do
+  gem 'simplecov', '~> 0.7.1'
+  gem 'simplecov-rcov'
+#  gem 'capybara-webkit'
+#  gem 'capybara-screenshot', '0.3.22' # 1.0.0 broke compat with rspec.  maybe we need newer rspec
+#  gem 'poltergeist'
+end
+
+gem 'pry'
+gem 'pry-remote'
+gem 'pry-stack_explorer'
+#gem 'pry-debugger'
diff --git a/ruby/.gitignore b/ruby/.gitignore
index 203591512..048a017ca 100644
--- a/ruby/.gitignore
+++ b/ruby/.gitignore
@@ -4,6 +4,7 @@
 .config
 .yardoc
 # Gemfile.lock
+Gemfile.alt.lock
 InstalledFiles
 _yardoc
 coverage
diff --git a/ruby/Gemfile b/ruby/Gemfile
index 0acea9c2e..78b244e46 100644
--- a/ruby/Gemfile
+++ b/ruby/Gemfile
@@ -20,9 +20,12 @@ else
   ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true"
 end
 
-
-# on mac, bundle config build.pg --with-cflags="-Wno-error=implicit-function-declaration"
-gem 'pg', '0.17.1', :platform => [:mri, :mswin, :mingw]
+if ENV['MODERN_OS'] == "1"
+  gem 'pg', '0.21.0'
+else
+  # on mac, bundle config build.pg --with-cflags="-Wno-error=implicit-function-declaration"
+  gem 'pg', '0.17.1', :platform => [:mri, :mswin, :mingw]
+end
 #gem 'jdbc_postgres', :platform => [:jruby]
 
 gem 'activerecord', '= 4.2.8'
diff --git a/ruby/Gemfile.alt b/ruby/Gemfile.alt
new file mode 100644
index 000000000..78b244e46
--- /dev/null
+++ b/ruby/Gemfile.alt
@@ -0,0 +1,115 @@
+#ruby=1.9.3
+source 'http://rubygems.org'
+unless ENV["LOCAL_DEV"] == "1"
+	source 'https://jamjam:blueberryjam@int.jamkazam.com/gems/'
+end
+
+ruby_version = ENV["JAM_RUBY_VERSION"]
+ruby_version = "2.3.1" if ruby_version.nil?
+
+ruby ruby_version
+
+# Look for $WORKSPACE, otherwise use "workspace" as dev path.
+devenv = ENV["BUILD_NUMBER"].nil?
+if devenv
+  #gem 'jam_db', :path=> "../db/target/ruby_package"
+  gem 'jampb', :path => "../pb/target/ruby/jampb"
+else
+  #gem 'jam_db'
+  gem 'jampb', "0.1.#{ENV["BUILD_NUMBER"]}"
+  ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true"
+end
+
+if ENV['MODERN_OS'] == "1"
+  gem 'pg', '0.21.0'
+else
+  # on mac, bundle config build.pg --with-cflags="-Wno-error=implicit-function-declaration"
+  gem 'pg', '0.17.1', :platform => [:mri, :mswin, :mingw]
+end
+#gem 'jdbc_postgres', :platform => [:jruby]
+
+gem 'activerecord', '= 4.2.8'
+gem 'railties', '= 4.2.8'
+gem 'actionmailer', '= 4.2.8'
+gem 'rails-observers', '0.1.2'
+gem 'protected_attributes' # needed to support attr_accessible
+
+# PINNED TO SUPPORT BOTH 2.3.1 and 2.4.1 Ruby simultaneously
+# This should be the same in ruby/admin/web/websocket-gateway
+#######
+gem 'nokogiri', '1.10.10' # added to pin before 1.11.0, which requires at leaost ruby 2.5.  unpin we go above
+gem 'sprockets', '3.6.3' # added to pin before 4.0.0, which requiurse at least ruby 2.5
+gem 'fog-brightbox', '0.11.0' # pinned until we are on ruby 2.5; then remove
+gem 'faraday', '0.9.2' # pinned untnil we are on ruby 2.5; then remove
+gem 'ruby-prof', '0.15.9' # pinned until we are on ruby 2.5; then remove
+gem 'rubyzip', '1.2.0'  # pinned until we are on ruby 2.5; then remove
+gem 'recurly', '2.18.16' # should upgrade to 3.x when we have time to validaate
+gem 'icalendar', '2.4.0' # pinned until we are on ruby 2.5; then remove
+gem 'email_validator', '1.6.0' # pinned until we are on ruby 2.5, then remove
+gem 'redis', '3.3.0' # pinned until we are on 2.5; then remove
+gem 'redis-namespace', '1.5.2' # pinned until we are on 2.5; then remove
+gem 'oj', '2.17.1' # pinned until we are on 2.5; then remove
+#######
+
+gem "activerecord-import", "~> 0.4.1"
+gem "auto_strip_attributes"
+gem "json", "1.8.6"
+gem 'uuidtools', '2.1.2'
+gem 'bcrypt', '3.1.15' 
+gem 'bcrypt-ruby' #, '3.0.1'
+gem 'ruby-protocol-buffers', '1.2.2'
+gem 'eventmachine', '1.0.4'
+gem 'amqp', '1.0.2'
+gem 'kickbox'
+gem 'will_paginate'
+gem 'sendgrid', '1.2.0'
+gem 'aws-sdk', '~> 1'
+gem 'carrierwave', '0.9.0'
+gem 'aasm'
+gem 'devise', '3.3.0' # 3.4.0 causes: uninitialized constant ActionController::Metal (NameError)
+gem 'postgres-copy'
+gem 'geokit'
+gem 'geokit-rails'
+gem 'postgres_ext'
+gem 'resque'
+gem 'resque-retry'
+gem 'resque-failed-job-mailer' #, :path => "/Users/seth/workspace/resque_failed_job_mailer"
+gem 'resque-lonely_job', '~> 1.0.0'
+gem 'resque_mailer'
+
+gem 'builder'
+gem 'fog'
+gem 'rest-client'
+gem 'iso-639'
+gem 'sanitize'
+#gem 'influxdb'
+gem 'sendgrid_toolkit', '>= 1.1.1'
+gem 'stripe'
+gem 'zip-codes'
+
+
+gem 'elasticsearch'
+
+gem 'logging', '1.7.2'
+
+group :test do
+  gem 'pry'
+  gem 'simplecov', '~> 0.7.1'
+  gem 'simplecov-rcov'
+  gem 'factory_girl', '4.5.0'
+  gem "rspec", "2.11"
+  gem 'spork', '0.9.0'
+  gem 'database_cleaner', '1.4.1'
+  gem 'faker', '1.3.0'
+  gem 'resque_spec' #, :path => "/home/jam/src/resque_spec/"
+  gem 'timecop'
+  gem 'rspec-prof'
+  gem 'time_difference'
+#  gem 'byebug'
+  gem 'stripe-ruby-mock'
+  gem 'webmock', '~> 3.11', '>= 3.11.2'
+
+end
+
+# Specify your gem's dependencies in jam_ruby.gemspec
+gemspec
diff --git a/web/.gitignore b/web/.gitignore
index d8f22f053..585c62dfb 100644
--- a/web/.gitignore
+++ b/web/.gitignore
@@ -30,6 +30,7 @@ jt_metadata.json
 artifacts
 
 #Gemfile.lock
+Gemfile.alt.lock
 .sass-cache
 log/development.log.age
 log/test.log.age
diff --git a/web/Gemfile b/web/Gemfile
index 54770d81e..5f5c068a7 100644
--- a/web/Gemfile
+++ b/web/Gemfile
@@ -70,7 +70,13 @@ gem 'bootstrap-will_paginate', '0.0.6'
 gem 'em-websocket', '>=0.4.0' #, :path => '/Users/seth/workspace/em-websocket'
 gem 'uuidtools', '2.1.2'
 gem 'ruby-protocol-buffers', '1.2.2'
-gem 'pg', '0.17.1'
+
+if ENV["MODERN_OS"] == "1"
+  gem 'pg', '0.21.0'
+else
+  gem 'pg', '0.17.1'
+end
+
 #gem 'compass-rails' #, '1.1.3'  # 1.1.4 throws an exception on startup about !initialize on nil
 #gem "compass-rails", github: "Compass/compass-rails", branch: "master"
 gem 'rabl', '0.13.1' # 0.14.3 has error on jenkins build server in ubuntu 12
@@ -239,5 +245,5 @@ group :production do
 end
 
 group :package do
-   gem 'fpm'
+   #gem 'fpm'
 end
diff --git a/web/Gemfile.alt b/web/Gemfile.alt
new file mode 100644
index 000000000..5f5c068a7
--- /dev/null
+++ b/web/Gemfile.alt
@@ -0,0 +1,249 @@
+source 'http://rubygems.org'
+# Look for $WORKSPACE, otherwise use "workspace" as dev path.
+
+devenv = ENV["BUILD_NUMBER"].nil? # Jenkins sets a build number environment variable
+
+ruby_version = ENV["JAM_RUBY_VERSION"]
+ruby_version = "2.3.1" if ruby_version.nil?
+
+ruby ruby_version
+
+if devenv
+  #gem 'jam_db', :path=> "../db/target/ruby_package"
+  gem 'jampb', :path => "../pb/target/ruby/jampb"
+  gem 'jam_ruby', :path => "../ruby"
+  gem 'jam_websockets', :path => "../websocket-gateway"
+else
+  source 'https://jamjam:blueberryjam@int.jamkazam.com/gems/' do
+    #gem 'jam_db', "0.1.#{ENV["BUILD_NUMBER"]}"
+    gem 'jampb',  "0.1.#{ENV["BUILD_NUMBER"]}"
+    gem 'jam_ruby',  "0.1.#{ENV["BUILD_NUMBER"]}"
+    gem 'jam_websockets',  "0.1.#{ENV["BUILD_NUMBER"]}"
+    ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true"
+  end
+end
+gem 'rails', '= 4.2.8'
+gem 'railties', '= 4.2.8'
+gem 'auto_strip_attributes', '2.6.0'
+gem 'protected_attributes'
+gem 'rails-observers'
+
+# PINNED TO SUPPORT BOTH 2.3.1 and 2.4.1 Ruby simultaneously
+# This should be the same in ruby/admin/web/websocket-gateway
+#######
+gem 'nokogiri', '1.10.10' # added to pin before 1.11.0, which requires at leaost ruby 2.5.  unpin we go above
+gem 'sprockets', '3.6.3' # added to pin before 4.0.0, which requiurse at least ruby 2.5
+gem 'fog-brightbox', '0.11.0' # pinned until we are on ruby 2.5; then remove
+gem 'faraday', '0.9.2' # pinned untnil we are on ruby 2.5; then remove
+gem 'ruby-prof', '0.15.9' # pinned until we are on ruby 2.5; then remove
+gem 'rubyzip', '1.2.1'  # pinned until we are on ruby 2.5; then remove
+gem 'recurly', '2.18.16' # should upgrade to 3.x when we have time to validaate
+gem 'icalendar', '2.4.0' # pinned until we are on ruby 2.5; then remove
+gem 'email_validator', '1.6.0' # pinned until we are on ruby 2.5, then remove
+gem 'redis', '3.3.3' # pinned until we are on 2.5; then remove
+gem 'redis-namespace', '1.5.3' # pinned until we are on 2.5; then remove
+gem 'oj', '3.1.3' # pinned until we are on 2.5; then remove
+gem 'bcrypt', '3.1.13'
+gem 'sass-rails', '5.0.7' # compiler mismatch issue between build and www
+gem 'sass', '3.5.5 '# compiler mismatch issue between build and www
+#1######
+
+gem 'responders', '~> 2.0'
+#gem 'sprockets', '3.2.0'
+gem 'sprockets-es6', require: 'sprockets/es6'
+gem 'sprockets-rails', '2.3.2'
+gem 'non-stupid-digest-assets'
+#gem 'license_finder'
+#gem 'pg_migrate', '0.1.14'
+#gem 'paypal-sdk-rest'
+gem 'paypal-sdk-merchant-jk', '1.118.1'
+gem 'kickbox'
+#gem 'oj' # '2.10.2'
+gem 'builder'
+gem 'jquery-rails'
+gem 'jquery-ui-rails', '4.2.1'
+#gem 'bootstrap-sass', '2.0.4'
+#gem 'bcrypt-ruby', '3.1.14'
+gem 'faker', '1.3.0'
+gem 'will_paginate' #, '3.0.3'
+gem 'bootstrap-will_paginate', '0.0.6'
+gem 'em-websocket', '>=0.4.0' #, :path => '/Users/seth/workspace/em-websocket'
+gem 'uuidtools', '2.1.2'
+gem 'ruby-protocol-buffers', '1.2.2'
+
+if ENV["MODERN_OS"] == "1"
+  gem 'pg', '0.21.0'
+else
+  gem 'pg', '0.17.1'
+end
+
+#gem 'compass-rails' #, '1.1.3'  # 1.1.4 throws an exception on startup about !initialize on nil
+#gem "compass-rails", github: "Compass/compass-rails", branch: "master"
+gem 'rabl', '0.13.1' # 0.14.3 has error on jenkins build server in ubuntu 12
+gem 'gon', '~>4.1.0' # for passthrough of Ruby variables to Javascript variables
+gem 'eventmachine', "1.2.3" #, '1.0.4'
+#gem 'faraday', '~>0.9.0'
+gem 'amqp', '0.9.8'
+#gem 'logging-rails', :require => 'logging/rails'
+#gem 'omniauth', '1.1.1'
+#gem 'omniauth-facebook', '1.4.1'
+#=======
+#gem 'logging-rails', :require => 'logging/rails'
+gem 'omniauth'
+gem 'omniauth-facebook'
+#>>>>>>> develop
+gem 'omniauth-twitter'
+gem 'omniauth-google-oauth2'
+gem 'omniauth-stripe-connect'
+gem 'google-api-client' #, '0.7.1'
+gem 'retriable', '3.0.1' # this is necessary because 3.0.2 has a bug when used by google-api-client
+#gem 'google-api-omniauth' #, '0.1.1'
+gem 'signet', '0.5.0'
+gem 'twitter'
+gem 'fb_graph', '2.5.9'
+gem 'sendgrid', '1.2.0'
+gem 'filepicker-rails', '0.1.0'
+gem 'aws-sdk', '~> 1'
+gem 'aasm' #, '3.0.16'
+gem 'carmen'
+gem 'carrierwave', '0.11.2' #, '0.9.0'
+gem 'carrierwave_direct'
+gem 'fog'
+#gem 'jquery-payment-rails', github: 'sethcall/jquery-payment-rails'
+gem 'haml-rails', '0.9.0' # pinned because upgrading lets u not do = "{% if(data.feed_item['has_mount?']) { %}" . ? is bad
+gem 'unf' #optional fog dependency
+gem 'devise', '3.3.0' #3.4.0 causes uninitialized constant ActionController::Metal (NameError)
+gem 'postgres-copy'
+gem 'prawn-table'
+#group :libv8 do
+#  gem 'libv8', "~> 3.11.8"
+#end
+gem 'geokit-rails'
+gem 'postgres_ext'
+gem 'resque'
+gem 'resque-scheduler', '4.3.0' # a bug in 4.4.0 stops resque schedule from starting. 4.3.0 is very old compared to 4.4.0 though
+gem 'resque-retry'
+gem 'resque-failed-job-mailer'
+gem 'resque-dynamic-queues'
+gem 'resque-lonely_job', '~> 1.0.0'
+gem 'resque_mailer'
+gem 'netaddr', '1.5.1'
+gem 'quiet_assets', :group => :development
+gem 'bugsnag', '5.3.2'
+gem 'multi_json' #, '1.9.0'
+gem 'rest-client'
+gem 'iso-639'
+gem 'language_list'
+#gem 'rubyzip'
+gem 'slim'
+gem 'htmlentities'
+gem 'sanitize'
+#gem 'recurly', '~> 2'
+#gem 'guard', '2.7.3'
+#gem 'influxdb' #, '0.1.8'
+gem 'cause' # needed by influxdb
+gem 'influxdb', '0.3.14'
+gem 'influxdb-rails', '0.1.12'
+gem 'sitemap_generator'
+gem 'bower-rails', "~> 0.9.2"
+gem 'react-rails', '1.3.3' #'~> 1.0'
+gem 'sendgrid_toolkit', '>= 1.1.1'
+gem 'stripe'
+gem 'zip-codes'
+#gem 'email_validator'
+#gem "browserify-rails", "~> 0.7"
+
+gem 'elasticsearch'
+
+gem 'logging', '1.7.2'
+
+
+if ENV['FASTER_PATH'] == '1'
+  # https://github.com/danielpclark/faster_path
+  # supposed to dramatically speed up page load time. Gotta install rust. go to github if interested
+  #gem 'faster_path', '~> 0.1.0', :group => :development
+end
+
+source 'https://rails-assets.org' do
+  gem 'rails-assets-reflux', '0.3.0'
+  gem 'rails-assets-classnames'
+#<<<<<<< HEAD
+#  gem 'rails-assets-react-select'
+  #gem "rails-assets-regenerator"
+  gem 'rails-assets-bluebird'
+#=======
+  gem 'rails-assets-react-select', '0.6.7'
+#>>>>>>> develop
+end
+
+#group :development, :production do
+#  gem 'rack-timeout'
+#end
+
+group :development, :test do
+  gem 'rspec-rails' #, require: "rspec/rails" #, '2.14.2'
+  gem 'rspec-collection_matchers'
+  gem "activerecord-import", "~> 0.4.1"
+#  gem 'guard-rspec', '0.5.5'
+#  gem 'jasmine', '1.3.1' 
+  gem 'pry'
+  gem 'execjs', '2.6.0 ' #, '1.4.0'
+  gem 'factory_girl_rails' # , '4.1.0' # in dev because in use by rake task
+  gem 'database_cleaner', '1.3.0' #in dev because in use by rake task
+  gem 'test-unit'
+  # gem 'teaspoon'
+  # gem 'teaspoon-jasmine'
+ gem 'puma'  
+  gem 'byebug'
+end
+group :unix do
+#  gem 'therubyracer' #, '0.11.0beta8'
+end
+
+# Gems used only for assets and not required
+# in production environments by default.
+
+gem 'coffee-rails'
+gem 'uglifier'
+gem 'coffee-script-source', '1.12.2'
+group :test, :cucumber do
+  gem 'simplecov', '~> 0.7.1'
+  gem 'simplecov-rcov'
+  gem 'capybara'
+  #gem 'rails-assets-sinon', source: 'https://rails-assets.org'
+  #gem 'sinon-rails'
+#if ENV['JAMWEB_QT5'] == '1'
+#  # necessary on platforms such as arch linux, where pacman -S qt5-webkit is your easiet option
+#  gem "capybara-webkit", :git => 'git://github.com/thoughtbot/capybara-webkit.git'
+#else
+#  gem "capybara-webkit"
+#end
+  gem 'capybara-screenshot', '1.0.25' #, '0.3.22' # 1.0.0 broke compat with rspec.  maybe we need newer rspec
+  gem 'selenium-webdriver'
+  gem 'webdrivers', '~> 4.0', require: false
+  gem "show_me_the_cookies"
+#  gem 'geckodriver-helper' # firefox
+
+  #  gem 'cucumber-rails', :require => false #, '1.3.0', :require => false
+#  gem 'guard-spork', '0.3.2'  
+  gem 'spork', '0.9.0'
+  gem 'launchy', '2.1.1'
+  gem 'rack-test'
+  # gem 'rb-fsevent', '0.9.1', :require => false
+  # gem 'growl', '1.0.3'
+  gem 'resque_spec'
+  gem 'timecop'
+  gem 'webmock', '~> 3.11', '>= 3.11.2'
+#  gem 'thin'
+end
+
+
+group :production do
+  gem 'unicorn'
+  gem 'newrelic_rpm'
+  gem 'god'
+end
+
+group :package do
+   #gem 'fpm'
+end
diff --git a/websocket-gateway/.gitignore b/websocket-gateway/.gitignore
index 9dec59c30..f2b32455d 100644
--- a/websocket-gateway/.gitignore
+++ b/websocket-gateway/.gitignore
@@ -4,6 +4,7 @@
 .config
 .yardoc
 #Gemfile.lock
+Gemfile.alt.lock
 InstalledFiles
 _yardoc
 coverage
diff --git a/websocket-gateway/Gemfile b/websocket-gateway/Gemfile
index 3f2638424..db64d6b8c 100644
--- a/websocket-gateway/Gemfile
+++ b/websocket-gateway/Gemfile
@@ -88,6 +88,12 @@ gem 'cause' # needed by influxdb
 gem 'sendgrid_toolkit', '>= 1.1.1'
 gem 'elasticsearch'
 
+if ENV["MODERN_OS"] == "1"
+  gem 'pg', '0.21.0'
+else
+  gem 'pg', '0.17.1'
+end
+
 group :development do
 	gem 'pry'
 end
diff --git a/websocket-gateway/Gemfile.alt b/websocket-gateway/Gemfile.alt
new file mode 100644
index 000000000..db64d6b8c
--- /dev/null
+++ b/websocket-gateway/Gemfile.alt
@@ -0,0 +1,126 @@
+#ruby=1.9.3-p327
+source 'http://rubygems.org'
+unless ENV['LOCAL_DEV'] == '1'
+  source 'https://jamjam:blueberryjam@int.jamkazam.com/gems/'
+end
+
+ruby_version = ENV["JAM_RUBY_VERSION"]
+ruby_version = "2.3.1" if ruby_version.nil?
+
+ruby ruby_version
+
+# Look for $WORKSPACE, otherwise use "workspace" as dev path.
+devenv = ENV["BUILD_NUMBER"].nil?
+if devenv
+  #gem 'jam_db', :path=> "../db/target/ruby_package"
+  gem 'jampb', :path => "../pb/target/ruby/jampb"
+  gem 'jam_ruby', :path => "../ruby"
+else
+  #gem 'jam_db', "0.1.#{ENV["BUILD_NUMBER"]}"
+  gem 'jampb',  "0.1.#{ENV["BUILD_NUMBER"]}"
+  gem 'jam_ruby',  "0.1.#{ENV["BUILD_NUMBER"]}"
+  ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true"
+end
+
+gem 'activerecord', '= 4.2.8'
+gem 'actionpack', '= 4.2.8'
+gem 'actionmailer', '= 4.2.8'
+gem 'protected_attributes'
+gem 'rails-observers'
+gem 'auto_strip_attributes', '2.6.0'
+
+# PINNED TO SUPPORT BOTH 2.3.1 and 2.4.1 Ruby simultaneously
+# This should be the same in ruby/admin/web/websocket-gateway
+#######
+gem 'nokogiri', '1.10.10' # added to pin before 1.11.0, which requires at leaost ruby 2.5.  unpin we go above
+gem 'sprockets', '3.6.3' # added to pin before 4.0.0, which requiurse at least ruby 2.5
+gem 'fog-brightbox', '0.11.0' # pinned until we are on ruby 2.5; then remove
+gem 'faraday', '0.9.2' # pinned untnil we are on ruby 2.5; then remove
+gem 'ruby-prof', '0.15.9' # pinned until we are on ruby 2.5; then remove
+gem 'rubyzip', '1.2.1'  # pinned until we are on ruby 2.5; then remove
+gem 'recurly', '2.18.16' # should upgrade to 3.x when we have time to validaate
+gem 'icalendar', '2.4.0' # pinned until we are on ruby 2.5; then remove
+gem 'email_validator', '1.6.0' # pinned until we are on ruby 2.5, then remove
+gem 'redis', '3.3.3' # pinned until we are on 2.5; then remove
+gem 'redis-namespace', '1.5.3' # pinned until we are on 2.5; then remove
+gem 'oj', '3.1.3' # pinned until we are on 2.5; then remove
+gem 'bcrypt', '3.1.13'
+gem 'mimemagic', :source => 'https://int.jamkazam.com/gems/'
+#######
+
+
+#gem 'license_finder'
+gem 'zip-codes'
+gem 'stripe'
+gem 'kickbox'
+gem 'uuidtools', '2.1.2'
+# On MacOSX: gem install bcrypt-ruby -v '3.0.1' -- --with-cflags=-Wno-implicit-function-declaration
+gem 'ruby-protocol-buffers', '1.2.2'
+gem 'em-websocket', '>=0.4.0' #, :path=> "#{workspace}/em-websocket-jam"
+gem 'amqp'
+gem 'logging'
+gem 'will_paginate'
+gem 'sendgrid'
+gem 'rb-readline'
+gem 'aasm' #, '3.0.16'
+gem 'carrierwave', '0.11.2'
+gem 'fog'
+gem 'devise', '3.3.0' # 3.4.0 causes uninitialized constant ActionController::Metal (NameError)
+gem 'postgres-copy'
+gem 'aws-sdk', '~> 1'
+gem 'bugsnag', '5.3.2'
+gem 'postgres_ext'
+gem 'resque'
+gem 'resque-retry'
+gem 'resque-failed-job-mailer'
+gem 'resque-lonely_job', '~> 1.0.0'
+gem 'resque_mailer'
+gem 'geokit'
+gem 'geokit-rails' #, '2.0.1'
+gem 'mime-types', '1.25.1'
+gem 'rest-client'
+gem 'netaddr', '1.5.1'
+gem 'iso-639'
+gem 'language_list'
+gem 'sanitize'
+#gem 'influxdb'
+gem 'cause' # needed by influxdb
+gem 'sendgrid_toolkit', '>= 1.1.1'
+gem 'elasticsearch'
+
+if ENV["MODERN_OS"] == "1"
+  gem 'pg', '0.21.0'
+else
+  gem 'pg', '0.17.1'
+end
+
+group :development do
+	gem 'pry'
+end
+
+group :test do
+    gem 'simplecov', '~> 0.7.1'
+    gem 'simplecov-rcov'
+    gem 'cucumber'
+    gem 'rspec', '2.14.1' # can go to 3.0, but requires changes to tests due to should removal, be_truthy, and other changes
+    gem 'factory_girl'
+    #gem 'spork', '0.9.0'
+#<<<<<<< HEAD
+    gem 'database_cleaner' #, '0.7.0'
+#    gem 'guard', '>= 0.10.0'
+#    gem 'guard-rspec', '>= 0.7.3'
+#    gem 'pg_migrate','0.1.13' #:path => "#{workspace}/pg_migrate_ruby"
+#=======
+#    gem 'database_cleaner', '0.7.0'
+    #gem 'pg_migrate','0.1.14' #:path => "#{workspace}/pg_migrate_ruby"
+#>>>>>>> develop
+    gem 'evented-spec'
+end
+
+group :production do
+    gem 'newrelic_rpm'
+end
+
+group :package do
+    gem 'fpm'
+end