diff --git a/.ruby-version b/.ruby-version
index 2bf1c1cc..73462a5a 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.3.1
+2.5.1
diff --git a/Gemfile b/Gemfile
index 54a30c3c..92ce6334 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
-ruby "~> 2.3.0"
+ruby "~> 2.5"
 
 gem 'rails', '~> 4.2'
-gem 'puma', '~> 3.6.0'
+gem 'puma', '~> 3.7'
 gem 'puma-heroku'
 gem 'rack-timeout'
 
@@ -73,14 +73,13 @@ gem 'delayed_job_active_record'
 gem 'binding_of_caller' # see has_changelog.rb
 
 group :production do
+  gem 'pg'
   gem 'rails_12factor'
   gem 'uglifier', '>= 1.3.0'
-
   gem 'newrelic_rpm'
 end
 
 group :test, :production do
-  gem 'pg'
   gem 'therubyracer', platforms: :ruby
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 6ec16148..fa4fd495 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -125,8 +125,8 @@ GEM
     db_text_search (0.2.2)
       activerecord (>= 4.1.15, < 6.0)
     debug_inspector (0.0.2)
-    delayed_job (4.1.3)
-      activesupport (>= 3.0, < 5.2)
+    delayed_job (4.1.5)
+      activesupport (>= 3.0, < 5.3)
     delayed_job_active_record (4.1.2)
       activerecord (>= 3.0, < 5.2)
       delayed_job (>= 3.0, < 5)
@@ -138,7 +138,7 @@ GEM
       warden (~> 1.2.3)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    domain_name (0.5.20161021)
+    domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
     execjs (2.7.0)
@@ -203,7 +203,7 @@ GEM
     kramdown (1.16.2)
     levenshtein-ffi (1.1.0)
       ffi (~> 1.9)
-    libv8 (3.16.14.15)
+    libv8 (3.16.14.19)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -267,12 +267,12 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    puma (3.6.0)
+    puma (3.11.4)
     puma-heroku (1.0.0)
       puma (~> 3.0)
     pundit (1.1.0)
       activesupport (>= 3.0.0)
-    rack (1.6.9)
+    rack (1.6.10)
     rack-test (0.6.3)
       rack (>= 1.0)
     rack-timeout (0.4.2)
@@ -325,7 +325,7 @@ GEM
     ref (2.0.0)
     responders (2.3.0)
       railties (>= 4.2.0, < 5.1)
-    rest-client (2.0.0)
+    rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
@@ -417,8 +417,8 @@ GEM
       stripe (>= 1.6, < 4.0)
     term-ansicolor (1.4.0)
       tins (~> 1.0)
-    therubyracer (0.12.2)
-      libv8 (~> 3.16.14.0)
+    therubyracer (0.12.3)
+      libv8 (~> 3.16.14.15)
       ref
     thor (0.19.4)
     thread_safe (0.3.6)
@@ -454,7 +454,7 @@ GEM
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.2)
+    unf_ext (0.0.7.5)
     unicode-display_width (1.3.0)
     warden (1.2.6)
       rack (>= 1.0)
@@ -501,7 +501,7 @@ DEPENDENCIES
   paranoia
   pg
   pry
-  puma (~> 3.6.0)
+  puma (~> 3.7)
   puma-heroku
   rack-timeout
   rails (~> 4.2)
@@ -533,7 +533,7 @@ DEPENDENCIES
   webmock
 
 RUBY VERSION
-   ruby 2.3.1p112
+   ruby 2.5.1p57
 
 BUNDLED WITH
-   1.16.1
+   1.16.2
diff --git a/README.rdoc b/README.rdoc
index f58f0246..c3b2623d 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -1,13 +1,13 @@
-= Notebook.ai  
+= Notebook.ai
 {<img src="https://travis-ci.org/indentlabs/notebook.png?branch=master" alt="Build Status" />}[https://travis-ci.org/indentlabs/notebook]
 {<img src="https://codeclimate.com/github/indentlabs/notebook/badges/gpa.svg" />}[https://codeclimate.com/github/indentlabs/notebook]
 {<img src="https://codeclimate.com/github/indentlabs/notebook/badges/coverage.svg" />}[https://codeclimate.com/github/indentlabs/notebook/coverage]
 {<img src="http://inch-ci.org/github/indentlabs/notebook.svg?branch=master" alt="Inline docs" />}[http://inch-ci.org/github/indentlabs/notebook]
- 
+
 == What is Notebook.ai?
- 
+
 see {live website}[http://notebook.ai/]
- 
+
 notebook is a set of tools for writers, game designers, and roleplayers to create magnificent universes – and everything within them.
 
 From a simple interface in your browser, on your phone, or on your tablet, you can do everything you'd ever want to do while creating your own little (or big!) world.
@@ -35,20 +35,9 @@ TL;DR Milestones are independent of each other -- work on whatever you want to s
 
 == Installing the notebook stack locally
 
-Install curl
+Install ruby 2.5.1
 
-    sudo apt install curl
-
-Install rvm (or your favorite ruby version manager)
-
-    \curl -sSL https://get.rvm.io | bash
-    source ~/.rvm/scripts/rvm
-
-Install ruby 2.3.1
-
-    rvm install ruby 2.3.1
-
-    rvm use 2.3.1
+    rbenv install 2.5.1
 
 Install necessary libraries