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.lock b/admin/Gemfile.lock
index 8abef39c6..dabb5e6da 100644
--- a/admin/Gemfile.lock
+++ b/admin/Gemfile.lock
@@ -1,19 +1,9 @@
-PATH
-  remote: ../pb/target/ruby/jampb
-  specs:
-    jampb (0.1.1)
-
-PATH
-  remote: ../ruby
-  specs:
-    jam_ruby (0.1.1)
-
 GEM
   remote: http://rubygems.org/
   remote: https://jamjam:blueberryjam@int.jamkazam.com/gems/
   specs:
     CFPropertyList (2.3.6)
-    aasm (5.1.1)
+    aasm (5.2.0)
       concurrent-ruby (~> 1.0)
     actionmailer (4.2.8)
       actionpack (= 4.2.8)
@@ -34,7 +24,7 @@ GEM
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active_material (1.4.2)
+    active_material (1.5.2)
     activeadmin (1.4.3)
       arbre (>= 1.1.1)
       coffee-rails
@@ -47,7 +37,7 @@ GEM
       ransack (>= 1.8.7)
       sass (~> 3.1)
       sprockets (< 4.1)
-    activeadmin-searchable_select (1.4.0)
+    activeadmin-searchable_select (1.5.0)
       activeadmin (>= 1.x, < 3)
       jquery-rails (>= 3.0, < 5)
       select2-rails (~> 4.0)
@@ -98,7 +88,7 @@ GEM
     aws-sdk-v1 (1.67.0)
       json (~> 1.4)
       nokogiri (~> 1)
-    backports (3.20.2)
+    backports (3.21.0)
     bcrypt (3.1.15)
     best_in_place (3.1.1)
       actionpack (>= 3.2)
@@ -144,8 +134,8 @@ GEM
     country-select (1.2.1)
     crass (1.0.6)
     database_cleaner (1.99.0)
-    debug_inspector (1.0.0)
-    devise (4.7.3)
+    debug_inspector (1.1.0)
+    devise (4.8.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -169,7 +159,7 @@ GEM
     et-orbi (1.2.4)
       tzinfo
     eventmachine (1.2.3)
-    excon (0.79.0)
+    excon (0.81.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
     factory_girl (4.9.0)
@@ -347,7 +337,7 @@ GEM
       pleaserun (~> 0.0.29)
       ruby-xz (~> 0.2.3)
       stud
-    fugit (1.4.2)
+    fugit (1.4.5)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.4)
     geokit (1.13.1)
@@ -404,6 +394,8 @@ GEM
     io-like (0.3.1)
     ipaddress (0.8.3)
     iso-639 (0.3.5)
+    jam_ruby (0.1.1173)
+    jampb (0.1.1173)
     jasmine (1.3.1)
       jasmine-core (~> 1.3.1)
       rack (~> 1.0)
@@ -438,35 +430,37 @@ GEM
     little-plugger (1.1.4)
     logging (1.7.2)
       little-plugger (>= 1.1.3)
-    loofah (2.9.0)
+    loofah (2.9.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     method_source (1.0.0)
     mime-types (1.25)
-    mimemagic (0.3.5)
-    mini_mime (1.0.2)
+    mimemagic (0.4.3)
+      nokogiri (~> 1)
+      rake
+    mini_mime (1.1.0)
     mini_portile2 (2.4.0)
-    minitest (5.14.3)
-    mono_logger (1.1.0)
+    minitest (5.14.4)
+    mono_logger (1.1.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     mustache (0.99.8)
     net-ssh (6.1.0)
     netrc (0.11.0)
-    nio4r (2.5.2)
+    nio4r (2.5.7)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    nokogumbo (2.0.4)
+    nokogumbo (2.0.5)
       nokogiri (~> 1.8, >= 1.8.4)
     oj (3.1.3)
     optimist (3.0.1)
     orm_adapter (0.5.0)
-    pg (0.17.1)
+    pg (0.21.0)
     pg_array_parser (0.0.9)
-    pleaserun (0.0.31)
+    pleaserun (0.0.32)
       cabin (> 0)
       clamp
       dotenv
@@ -485,7 +479,7 @@ GEM
     power_assert (2.0.0)
     protected_attributes (1.1.4)
       activemodel (>= 4.0.1, < 5.0)
-    pry (0.14.0)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-remote (0.1.8)
@@ -495,7 +489,7 @@ GEM
       binding_of_caller (~> 0.7)
       pry (~> 0.13)
     public_suffix (4.0.6)
-    puma (5.2.1)
+    puma (5.3.2)
       nio4r (~> 2.0)
     raabro (1.4.0)
     rack (1.6.13)
@@ -514,7 +508,7 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 4.2.8)
       sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
+    rails-deprecated_sanitizer (1.0.4)
       activesupport (>= 4.2.0.alpha)
     rails-dom-testing (1.0.9)
       activesupport (>= 4.2.0, < 5.0)
@@ -538,7 +532,7 @@ GEM
       activerecord (>= 3.0, < 5.2)
       activesupport (>= 3.0, < 5.2)
       i18n
-    rb-fsevent (0.10.4)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rbvmomi (2.4.1)
@@ -594,7 +588,7 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-rails (4.0.2)
+    rspec-rails (4.1.2)
       actionpack (>= 4.2)
       activesupport (>= 4.2)
       railties (>= 4.2)
@@ -608,8 +602,8 @@ GEM
     ruby-xz (0.2.3)
       ffi (~> 1.9)
       io-like (~> 0.3)
-    ruby_parser (3.15.1)
-      sexp_processor (~> 4.9)
+    ruby_parser (3.16.0)
+      sexp_processor (~> 4.15, >= 4.15.1)
     rubyzip (1.2.1)
     rufus-scheduler (3.7.0)
       fugit (~> 1.1, >= 1.1.6)
@@ -636,7 +630,7 @@ GEM
       json
     sendgrid_toolkit (1.4.0)
       httparty (>= 0.7.6)
-    sexp_processor (4.15.2)
+    sexp_processor (4.15.3)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
@@ -658,10 +652,10 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    stripe (5.29.1)
+    stripe (5.33.0)
     stud (0.0.23)
     temple (0.8.2)
-    test-unit (3.4.0)
+    test-unit (3.4.1)
       power_assert
     thor (1.1.0)
     thread_safe (0.3.6)
@@ -673,7 +667,7 @@ GEM
     unf (0.1.3)
       unf_ext
     unf_ext (0.0.7.7)
-    unicorn (5.8.0)
+    unicorn (6.0.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     uuidtools (2.1.2)
@@ -735,8 +729,8 @@ DEPENDENCIES
   influxdb (= 0.3.14)
   influxdb-rails (= 0.1.12)
   iso-639
-  jam_ruby!
-  jampb!
+  jam_ruby (= 0.1.1173)!
+  jampb (= 0.1.1173)!
   jasmine (= 1.3.1)
   jquery-rails
   jquery-ui-rails
@@ -748,7 +742,7 @@ DEPENDENCIES
   net-ssh
   nokogiri (= 1.10.10)
   oj (= 3.1.3)
-  pg (= 0.17.1)
+  pg (= 0.21.0)
   postgres-copy (= 0.6.0)
   postgres_ext
   protected_attributes
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.lock b/ruby/Gemfile.lock
index 7632c7aa6..3348f8b32 100644
--- a/ruby/Gemfile.lock
+++ b/ruby/Gemfile.lock
@@ -1,8 +1,3 @@
-PATH
-  remote: ../pb/target/ruby/jampb
-  specs:
-    jampb (0.1.1)
-
 PATH
   remote: .
   specs:
@@ -13,7 +8,7 @@ GEM
   remote: https://jamjam:blueberryjam@int.jamkazam.com/gems/
   specs:
     CFPropertyList (2.3.6)
-    aasm (5.1.1)
+    aasm (5.2.0)
       concurrent-ruby (~> 1.0)
     actionmailer (4.2.8)
       actionpack (= 4.2.8)
@@ -110,7 +105,7 @@ GEM
     et-orbi (1.2.4)
       tzinfo
     eventmachine (1.0.4)
-    excon (0.78.1)
+    excon (0.81.0)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
     faker (1.3.0)
@@ -267,7 +262,7 @@ GEM
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
     formatador (0.2.5)
-    fugit (1.4.2)
+    fugit (1.4.5)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.4)
     geokit (1.13.1)
@@ -289,6 +284,7 @@ GEM
     inflecto (0.0.2)
     ipaddress (0.8.3)
     iso-639 (0.3.5)
+    jampb (0.1.1173)
     json (1.8.6)
     kickbox (2.0.4)
       faraday (~> 0.9)
@@ -296,7 +292,7 @@ GEM
     little-plugger (1.1.4)
     logging (1.7.2)
       little-plugger (>= 1.1.3)
-    loofah (2.9.0)
+    loofah (2.9.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -304,23 +300,23 @@ GEM
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.1104)
-    mini_mime (1.0.2)
+    mime-types-data (3.2021.0225)
+    mini_mime (1.1.0)
     mini_portile2 (2.4.0)
-    minitest (5.14.3)
-    mono_logger (1.1.0)
+    minitest (5.14.4)
+    mono_logger (1.1.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     netrc (0.11.0)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    nokogumbo (2.0.4)
+    nokogumbo (2.0.5)
       nokogiri (~> 1.8, >= 1.8.4)
     oj (2.17.1)
     optimist (3.0.1)
     orm_adapter (0.5.0)
-    pg (0.17.1)
+    pg (0.21.0)
     pg_array_parser (0.0.9)
     postgres-copy (1.2.0)
       activerecord (>= 4.0, < 5.1)
@@ -332,7 +328,7 @@ GEM
       pg_array_parser (~> 0.0.9)
     protected_attributes (1.1.4)
       activemodel (>= 4.0.1, < 5.0)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
@@ -353,7 +349,7 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 4.2.8)
       sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
+    rails-deprecated_sanitizer (1.0.4)
       activesupport (>= 4.2.0.alpha)
     rails-dom-testing (1.0.9)
       activesupport (>= 4.2.0, < 5.0)
@@ -411,7 +407,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.2.4)
+    rexml (3.2.5)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
       rspec-expectations (~> 2.11.0)
@@ -454,7 +450,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    stripe (5.29.0)
+    stripe (5.33.0)
     stripe-ruby-mock (3.0.1)
       dante (>= 0.2.0)
       multi_json (~> 1.0)
@@ -464,7 +460,7 @@ GEM
     tilt (2.0.10)
     time_difference (0.5.0)
       activesupport
-    timecop (0.9.2)
+    timecop (0.9.4)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
     unf (0.1.4)
@@ -475,13 +471,15 @@ GEM
       rack (>= 1.0.0)
     warden (1.2.7)
       rack (>= 1.0)
-    webmock (3.11.2)
+    webmock (3.13.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.7.0)
     will_paginate (3.3.0)
     xml-simple (1.1.8)
-    xmlrpc (0.3.1)
+    xmlrpc (0.3.2)
+      webrick
     zip-codes (0.2.1)
 
 PLATFORMS
@@ -514,13 +512,13 @@ DEPENDENCIES
   icalendar (= 2.4.0)
   iso-639
   jam_ruby!
-  jampb!
+  jampb (= 0.1.1173)
   json (= 1.8.6)
   kickbox
   logging (= 1.7.2)
   nokogiri (= 1.10.10)
   oj (= 2.17.1)
-  pg (= 0.17.1)
+  pg (= 0.21.0)
   postgres-copy
   postgres_ext
   protected_attributes
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.lock b/web/Gemfile.lock
index 1a150ba57..9345e640b 100644
--- a/web/Gemfile.lock
+++ b/web/Gemfile.lock
@@ -1,24 +1,10 @@
-PATH
-  remote: ../pb/target/ruby/jampb
-  specs:
-    jampb (0.1.1)
-
-PATH
-  remote: ../ruby
-  specs:
-    jam_ruby (0.1.1)
-
-PATH
-  remote: ../websocket-gateway
-  specs:
-    jam_websockets (0.1.1)
-
 GEM
   remote: http://rubygems.org/
+  remote: https://jamjam:blueberryjam@int.jamkazam.com/gems/
   remote: https://rails-assets.org/
   specs:
     CFPropertyList (2.3.6)
-    aasm (5.1.1)
+    aasm (5.2.0)
       concurrent-ruby (~> 1.0)
     actionmailer (4.2.8)
       actionpack (= 4.2.8)
@@ -71,8 +57,6 @@ GEM
       amq-protocol (>= 0.9.4)
       eventmachine
     arel (6.0.4)
-    arr-pm (0.0.10)
-      cabin (> 0)
     attr_required (1.0.1)
     auto_strip_attributes (2.6.0)
       activerecord (>= 4.0)
@@ -89,24 +73,22 @@ GEM
     babel-transpiler (0.7.0)
       babel-source (>= 4.0, < 6)
       execjs (~> 2.0)
-    backports (3.20.2)
     bcrypt (3.1.13)
-    bindata (2.4.8)
+    bindata (2.4.10)
     bootstrap-will_paginate (0.0.6)
       will_paginate
     bower-rails (0.9.2)
     buftok (0.2.0)
     bugsnag (5.3.2)
     builder (3.2.4)
-    byebug (11.0.1)
-    cabin (0.9.0)
-    capybara (3.15.1)
+    byebug (11.1.3)
+    capybara (3.32.2)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.2)
+      regexp_parser (~> 1.5)
       xpath (~> 3.2)
     capybara-screenshot (1.0.25)
       capybara (>= 1.0, < 4)
@@ -125,7 +107,6 @@ GEM
     cause (0.1)
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
-    clamp (1.0.1)
     coderay (1.1.3)
     coffee-rails (4.2.2)
       coffee-script (>= 2.2.0)
@@ -135,7 +116,7 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.1.8)
-    connection_pool (2.2.3)
+    connection_pool (2.2.5)
     crack (0.4.5)
       rexml
     crass (1.0.6)
@@ -149,7 +130,6 @@ GEM
     diff-lcs (1.4.4)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.6)
     elasticsearch (7.4.0)
       elasticsearch-api (= 7.4.0)
       elasticsearch-transport (= 7.4.0)
@@ -168,7 +148,7 @@ GEM
     et-orbi (1.2.4)
       tzinfo
     eventmachine (1.2.3)
-    excon (0.79.0)
+    excon (0.81.0)
     execjs (2.6.0)
     extlib (0.9.16)
     factory_girl (4.9.0)
@@ -185,7 +165,7 @@ GEM
       json
       rack-oauth2 (>= 0.14.4)
       tzinfo
-    ffi (1.12.2)
+    ffi (1.15.0)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
@@ -342,27 +322,13 @@ GEM
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
     formatador (0.2.5)
-    fpm (1.12.0)
-      arr-pm (~> 0.0.10)
-      backports (>= 2.6.2)
-      cabin (>= 0.6.0)
-      childprocess (< 1.0.0)
-      clamp (~> 1.0.0)
-      ffi (~> 1.12.0)
-      git (>= 1.3.0, < 2.0)
-      json (>= 1.7.7, < 3.0)
-      pleaserun (~> 0.0.29)
-      ruby-xz (~> 0.2.3)
-      stud
-    fugit (1.4.2)
+    fugit (1.4.5)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.4)
     geokit (1.13.1)
     geokit-rails (2.3.2)
       geokit (~> 1.5)
       rails (>= 3.0)
-    git (1.8.1)
-      rchardet (~> 1.8)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     god (0.13.7)
@@ -422,10 +388,11 @@ GEM
     influxdb-rails (0.1.12)
       influxdb (~> 0.3.0)
       railties
-    insist (1.0.0)
-    io-like (0.3.1)
     ipaddress (0.8.3)
     iso-639 (0.3.5)
+    jam_ruby (0.1.1173)
+    jam_websockets (0.1.1173)
+    jampb (0.1.1173)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -433,11 +400,11 @@ GEM
     jquery-ui-rails (4.2.1)
       railties (>= 3.2.16)
     json (1.8.6)
-    json-jwt (1.12.0)
+    json-jwt (1.13.0)
       activesupport (>= 4.2)
       aes_key_wrap
       bindata
-    jwt (2.2.2)
+    jwt (2.2.3)
     kgio (2.11.3)
     kickbox (2.0.4)
       faraday (~> 0.9)
@@ -448,7 +415,7 @@ GEM
     little-plugger (1.1.4)
     logging (1.7.2)
       little-plugger (>= 1.1.3)
-    loofah (2.9.0)
+    loofah (2.9.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -458,29 +425,30 @@ GEM
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0212)
-    mimemagic (0.3.5)
-    mini_mime (1.0.2)
+    mime-types-data (3.2021.0225)
+    mimemagic (0.4.3)
+      nokogiri (~> 1)
+      rake
+    mini_mime (1.1.0)
     mini_portile2 (2.4.0)
-    minitest (5.14.3)
-    mono_logger (1.1.0)
+    minitest (5.14.4)
+    mono_logger (1.1.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    mustache (0.99.8)
     naught (1.1.0)
     netaddr (1.5.1)
     netrc (0.11.0)
-    newrelic_rpm (6.15.0)
-    nio4r (2.5.2)
+    newrelic_rpm (7.0.0)
+    nio4r (2.5.7)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    nokogumbo (2.0.4)
+    nokogumbo (2.0.5)
       nokogiri (~> 1.8, >= 1.8.4)
     non-stupid-digest-assets (1.0.9)
       sprockets (>= 2.0)
-    oauth (0.5.5)
-    oauth2 (1.4.4)
+    oauth (0.5.6)
+    oauth2 (1.4.7)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
@@ -492,10 +460,10 @@ GEM
       rack (>= 1.6.2, < 3)
     omniauth-facebook (8.0.0)
       omniauth-oauth2 (~> 1.2)
-    omniauth-google-oauth2 (0.8.1)
+    omniauth-google-oauth2 (0.8.2)
       jwt (>= 2.0)
       oauth2 (~> 1.1)
-      omniauth (>= 1.1.1)
+      omniauth (~> 1.1)
       omniauth-oauth2 (>= 1.6)
     omniauth-oauth (1.2.0)
       oauth
@@ -517,15 +485,8 @@ GEM
     paypal-sdk-merchant-jk (1.118.1)
       paypal-sdk-core (~> 0.3.0)
     pdf-core (0.7.0)
-    pg (0.17.1)
+    pg (0.21.0)
     pg_array_parser (0.0.9)
-    pleaserun (0.0.31)
-      cabin (> 0)
-      clamp
-      dotenv
-      insist
-      mustache (= 0.99.8)
-      stud
     postgres-copy (1.2.0)
       activerecord (>= 4.0, < 5.1)
       pg (>= 0.17)
@@ -542,11 +503,11 @@ GEM
       prawn (>= 1.3.0, < 3.0.0)
     protected_attributes (1.1.4)
       activemodel (>= 4.0.1, < 5.0)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (4.0.6)
-    puma (5.2.0)
+    puma (5.3.2)
       nio4r (~> 2.0)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
@@ -582,7 +543,7 @@ GEM
       rails-assets-classnames (>= 1.2.2, < 2)
       rails-assets-react-input-autosize (>= 0.4.3, < 0.5)
     rails-assets-reflux (0.3.0)
-    rails-deprecated_sanitizer (1.0.3)
+    rails-deprecated_sanitizer (1.0.4)
       activesupport (>= 4.2.0.alpha)
     rails-dom-testing (1.0.9)
       activesupport (>= 4.2.0, < 5.0)
@@ -599,7 +560,7 @@ GEM
       thor (>= 0.18.1, < 2.0)
     raindrops (0.19.1)
     rake (13.0.3)
-    rb-fsevent (0.10.4)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rbvmomi (2.4.1)
@@ -607,7 +568,6 @@ GEM
       json (>= 1.8)
       nokogiri (~> 1.5)
       optimist (~> 3.0)
-    rchardet (1.8.0)
     react-rails (1.3.3)
       babel-transpiler (>= 0.7.0)
       coffee-script-source (~> 1.8)
@@ -667,7 +627,7 @@ GEM
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-rails (4.0.2)
+    rspec-rails (4.1.2)
       actionpack (>= 4.2)
       activesupport (>= 4.2)
       railties (>= 4.2)
@@ -678,11 +638,8 @@ GEM
     rspec-support (3.10.2)
     ruby-prof (0.15.9)
     ruby-protocol-buffers (1.2.2)
-    ruby-xz (0.2.3)
-      ffi (~> 1.9)
-      io-like (~> 0.3)
-    ruby_parser (3.15.1)
-      sexp_processor (~> 4.9)
+    ruby_parser (3.16.0)
+      sexp_processor (~> 4.15, >= 4.15.1)
     rubyzip (1.2.1)
     rufus-scheduler (3.7.0)
       fugit (~> 1.1, >= 1.1.6)
@@ -708,7 +665,7 @@ GEM
       json
     sendgrid_toolkit (1.4.0)
       httparty (>= 0.7.6)
-    sexp_processor (4.15.2)
+    sexp_processor (4.15.3)
     show_me_the_cookies (5.0.1)
       capybara (>= 2, < 4)
     signet (0.5.0)
@@ -744,16 +701,15 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    stripe (5.29.0)
-    stud (0.0.23)
+    stripe (5.33.0)
     temple (0.8.2)
-    test-unit (3.4.0)
+    test-unit (3.4.1)
       power_assert
     thor (1.1.0)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    timecop (0.9.2)
-    ttfunk (1.5.1)
+    timecop (0.9.4)
+    ttfunk (1.6.2.1)
     twitter (7.0.0)
       addressable (~> 2.3)
       buftok (~> 0.2.0)
@@ -772,7 +728,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
-    unicorn (5.8.0)
+    unicorn (6.0.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     uuidtools (2.1.2)
@@ -784,13 +740,15 @@ GEM
       nokogiri (~> 1.6)
       rubyzip (~> 1.0)
       selenium-webdriver (>= 3.0, < 4.0)
-    webmock (3.12.2)
+    webmock (3.13.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
+    webrick (1.7.0)
     will_paginate (3.3.0)
     xml-simple (1.1.8)
-    xmlrpc (0.3.1)
+    xmlrpc (0.3.2)
+      webrick
     xpath (3.2.0)
       nokogiri (~> 1.8)
     zip-codes (0.2.1)
@@ -832,7 +790,6 @@ DEPENDENCIES
   filepicker-rails (= 0.1.0)
   fog
   fog-brightbox (= 0.11.0)
-  fpm
   geokit-rails
   god
   gon (~> 4.1.0)
@@ -843,9 +800,9 @@ DEPENDENCIES
   influxdb (= 0.3.14)
   influxdb-rails (= 0.1.12)
   iso-639
-  jam_ruby!
-  jam_websockets!
-  jampb!
+  jam_ruby (= 0.1.1173)!
+  jam_websockets (= 0.1.1173)!
+  jampb (= 0.1.1173)!
   jquery-rails
   jquery-ui-rails (= 4.2.1)
   kickbox
@@ -864,7 +821,7 @@ DEPENDENCIES
   omniauth-stripe-connect
   omniauth-twitter
   paypal-sdk-merchant-jk (= 1.118.1)
-  pg (= 0.17.1)
+  pg (= 0.21.0)
   postgres-copy
   postgres_ext
   prawn-table
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.lock b/websocket-gateway/Gemfile.lock
index fb4987b4f..8f2fdd1c1 100644
--- a/websocket-gateway/Gemfile.lock
+++ b/websocket-gateway/Gemfile.lock
@@ -1,20 +1,10 @@
-PATH
-  remote: ../pb/target/ruby/jampb
-  specs:
-    jampb (0.1.1)
-
-PATH
-  remote: ../ruby
-  specs:
-    jam_ruby (0.1.1)
-
 GEM
   remote: http://rubygems.org/
   remote: https://jamjam:blueberryjam@int.jamkazam.com/gems/
   remote: https://int.jamkazam.com/gems/
   specs:
     CFPropertyList (2.3.6)
-    aasm (5.1.1)
+    aasm (5.2.0)
       concurrent-ruby (~> 1.0)
     actionmailer (4.2.8)
       actionpack (= 4.2.8)
@@ -67,7 +57,7 @@ GEM
     aws-sdk-v1 (1.67.0)
       json (~> 1.4)
       nokogiri (~> 1)
-    backports (3.20.2)
+    backports (3.21.0)
     bcrypt (3.1.13)
     bugsnag (5.3.2)
     builder (3.2.4)
@@ -145,7 +135,7 @@ GEM
       tzinfo
     evented-spec (0.9.0)
     eventmachine (1.2.7)
-    excon (0.79.0)
+    excon (0.81.0)
     factory_girl (4.9.0)
       activesupport (>= 3.0.0)
     faraday (0.9.2)
@@ -313,7 +303,7 @@ GEM
       pleaserun (~> 0.0.29)
       ruby-xz (~> 0.2.3)
       stud
-    fugit (1.4.2)
+    fugit (1.4.5)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.4)
     geokit (1.13.1)
@@ -338,15 +328,18 @@ GEM
     io-like (0.3.1)
     ipaddress (0.8.3)
     iso-639 (0.3.5)
+    jam_ruby (0.1.1173)
+    jampb (0.1.1173)
     json (1.8.6)
     kickbox (2.0.4)
       faraday (~> 0.9)
       json (>= 1.8)
     language_list (1.2.1)
     little-plugger (1.1.4)
-    logging (1.7.2)
-      little-plugger (>= 1.1.3)
-    loofah (2.9.0)
+    logging (2.3.0)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.14)
+    loofah (2.9.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -354,11 +347,13 @@ GEM
     method_source (1.0.0)
     middleware (0.1.0)
     mime-types (1.25.1)
-    mimemagic (0.3.5)
-    mini_mime (1.0.2)
+    mimemagic (0.4.3)
+      nokogiri (~> 1)
+      rake
+    mini_mime (1.1.0)
     mini_portile2 (2.4.0)
-    minitest (5.14.3)
-    mono_logger (1.1.0)
+    minitest (5.14.4)
+    mono_logger (1.1.1)
     multi_json (1.15.0)
     multi_test (0.1.2)
     multi_xml (0.6.0)
@@ -366,17 +361,17 @@ GEM
     mustache (0.99.8)
     netaddr (1.5.1)
     netrc (0.11.0)
-    newrelic_rpm (6.15.0)
+    newrelic_rpm (7.0.0)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    nokogumbo (2.0.4)
+    nokogumbo (2.0.5)
       nokogiri (~> 1.8, >= 1.8.4)
     oj (3.1.3)
     optimist (3.0.1)
     orm_adapter (0.5.0)
-    pg (0.17.1)
+    pg (0.21.0)
     pg_array_parser (0.0.9)
-    pleaserun (0.0.31)
+    pleaserun (0.0.32)
       cabin (> 0)
       clamp
       dotenv
@@ -398,7 +393,7 @@ GEM
       middleware
       thor
       thread_safe
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     raabro (1.4.0)
@@ -418,7 +413,7 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 4.2.8)
       sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
+    rails-deprecated_sanitizer (1.0.4)
       activesupport (>= 4.2.0.alpha)
     rails-dom-testing (1.0.9)
       activesupport (>= 4.2.0, < 5.0)
@@ -514,7 +509,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    stripe (5.29.0)
+    stripe (5.33.0)
     stud (0.0.23)
     sys-uname (1.2.2)
       ffi (~> 1.1)
@@ -531,9 +526,11 @@ GEM
       rack (>= 1.0.0)
     warden (1.2.7)
       rack (>= 1.0)
+    webrick (1.7.0)
     will_paginate (3.3.0)
     xml-simple (1.1.8)
-    xmlrpc (0.3.1)
+    xmlrpc (0.3.2)
+      webrick
     zip-codes (0.2.1)
 
 PLATFORMS
@@ -567,8 +564,8 @@ DEPENDENCIES
   geokit-rails
   icalendar (= 2.4.0)
   iso-639
-  jam_ruby!
-  jampb!
+  jam_ruby (= 0.1.1173)
+  jampb (= 0.1.1173)
   kickbox
   language_list
   logging
@@ -578,6 +575,7 @@ DEPENDENCIES
   newrelic_rpm
   nokogiri (= 1.10.10)
   oj (= 3.1.3)
+  pg (= 0.21.0)
   postgres-copy
   postgres_ext
   protected_attributes