diff --git a/Gemfile b/Gemfile
index 6f0e48bc..3b1b2cd2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,7 @@ gem 'jquery-turbolinks'
 gem 'ims-lti'
 gem 'kramdown'
 gem 'newrelic_rpm'
-gem 'pg'
+gem 'pg', platform: :ruby
 gem 'pry'
 gem 'puma'
 gem 'pundit'
diff --git a/Gemfile.lock b/Gemfile.lock
index b4d6c767..d27789ea 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,39 +2,45 @@ GEM
   remote: https://rubygems.org/
   specs:
     ZenTest (4.11.0)
-    actionmailer (4.1.13)
-      actionpack (= 4.1.13)
-      actionview (= 4.1.13)
+    actionmailer (4.1.10)
+      actionpack (= 4.1.10)
+      actionview (= 4.1.10)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.13)
-      actionview (= 4.1.13)
-      activesupport (= 4.1.13)
+    actionpack (4.1.10)
+      actionview (= 4.1.10)
+      activesupport (= 4.1.10)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.13)
-      activesupport (= 4.1.13)
+    actionview (4.1.10)
+      activesupport (= 4.1.10)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.13)
-      activesupport (= 4.1.13)
+    activemodel (4.1.10)
+      activesupport (= 4.1.10)
       builder (~> 3.1)
-    activerecord (4.1.13)
-      activemodel (= 4.1.13)
-      activesupport (= 4.1.13)
+    activerecord (4.1.10)
+      activemodel (= 4.1.10)
+      activesupport (= 4.1.10)
       arel (~> 5.0.0)
-    activesupport (4.1.13)
+    activerecord-jdbc-adapter (1.3.15)
+      activerecord (>= 2.2)
+    activerecord-jdbcpostgresql-adapter (1.3.15)
+      activerecord-jdbc-adapter (~> 1.3.15)
+      jdbc-postgres (>= 9.1)
+    activesupport (4.1.10)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     arel (5.0.1.20140414130214)
-    ast (2.1.0)
-    astrolabe (1.3.1)
-      parser (~> 2.2)
+    ast (2.0.0)
+    astrolabe (1.3.0)
+      parser (>= 2.2.0.pre.3, < 3.0)
     autotest-rails (4.2.1)
       ZenTest (~> 4.5)
     bcrypt (3.1.10)
+    bcrypt (3.1.10-java)
     better_errors (2.1.1)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
@@ -53,7 +59,7 @@ GEM
     capistrano-bundler (1.1.4)
       capistrano (~> 3.1)
       sshkit (~> 1.2)
-    capistrano-rails (1.1.5)
+    capistrano-rails (1.1.2)
       capistrano (~> 3.1)
       capistrano-bundler (~> 1.1)
     capistrano-rvm (0.1.2)
@@ -62,10 +68,10 @@ GEM
     capistrano-stats (1.1.1)
     capistrano-upload-config (0.6.0)
       capistrano (>= 3.0)
-    capistrano3-puma (1.2.1)
+    capistrano3-puma (0.9.0)
       capistrano (~> 3.0)
       puma (>= 2.6)
-    capybara (2.5.0)
+    capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -78,7 +84,7 @@ GEM
       mime-types (>= 1.16)
     childprocess (0.5.6)
       ffi (~> 1.0, >= 1.0.11)
-    codeclimate-test-reporter (0.4.8)
+    codeclimate-test-reporter (0.4.7)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
     coffee-rails (4.0.1)
@@ -87,67 +93,74 @@ GEM
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1.1)
+    coffee-script-source (1.9.1)
     colorize (0.7.7)
-    concurrent-ruby (0.9.1)
-    concurrent-ruby-ext (0.9.1)
-      concurrent-ruby (~> 0.9.1)
-    database_cleaner (1.5.1)
+    concurrent-ruby (0.8.0)
+      ref (~> 1.0, >= 1.0.5)
+    concurrent-ruby (0.8.0-java)
+    concurrent-ruby-ext (0.8.0)
+      concurrent-ruby (~> 0.8.0)
+    database_cleaner (1.4.1)
     debug_inspector (0.0.2)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    docker-api (1.21.4)
+    docker-api (1.21.1)
       excon (>= 0.38.0)
       json
     erubis (2.7.0)
     eventmachine (1.0.8)
-    excon (0.45.4)
-    execjs (2.6.0)
+    eventmachine (1.0.8-java)
+    excon (0.45.2)
+    execjs (2.5.2)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.5.0)
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
-    faraday (0.9.2)
+    faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
     faye-websocket (0.10.0)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
-    ffi (1.9.10)
+    ffi (1.9.8)
+    ffi (1.9.8-java)
     forgery (0.6.0)
-    highline (1.7.8)
+    highline (1.7.1)
     hike (1.2.3)
     i18n (0.7.0)
-    ims-lti (1.1.10)
+    ims-lti (1.1.8)
       builder
       oauth (~> 0.4.5)
-    jbuilder (2.3.2)
+    jbuilder (2.2.13)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
-    jquery-rails (3.1.4)
+    jdbc-postgres (9.4.1200)
+    jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     jquery-turbolinks (2.1.0)
       railties (>= 3.1.0)
       turbolinks
-    json (1.8.3)
-    jwt (1.5.1)
-    kramdown (1.9.0)
+    json (1.8.2)
+    json (1.8.2-java)
+    jwt (1.4.1)
+    kramdown (1.6.0)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (2.6.2)
+    mime-types (2.4.3)
     mini_portile (0.6.2)
-    minitest (5.8.1)
-    multi_json (1.11.2)
+    minitest (5.5.1)
+    multi_json (1.11.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (3.0.1)
-    newrelic_rpm (3.14.0.305)
+    net-ssh (2.9.2)
+    newrelic_rpm (3.11.2.286)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
+    nokogiri (1.6.6.2-java)
     nyan-cat-formatter (0.11)
       rspec (>= 2.99, >= 2.14.2, < 4)
     oauth (0.4.7)
@@ -157,84 +170,91 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    parser (2.2.3.0)
+    parser (2.2.0.3)
       ast (>= 1.1, < 3.0)
-    pg (0.18.3)
+    pg (0.18.1)
     polyamorous (1.2.0)
       activerecord (>= 3.0)
-    powerpack (0.1.1)
-    pry (0.10.3)
+    powerpack (0.1.0)
+    pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    puma (2.14.0)
-    pundit (1.0.1)
+    pry (0.10.1-java)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+      spoon (~> 0.0)
+    puma (2.11.1)
+      rack (>= 1.1, < 2.0)
+    puma (2.11.1-java)
+      rack (>= 1.1, < 2.0)
+    pundit (0.3.0)
       activesupport (>= 3.0.0)
-    rack (1.5.5)
+    rack (1.5.2)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.13)
-      actionmailer (= 4.1.13)
-      actionpack (= 4.1.13)
-      actionview (= 4.1.13)
-      activemodel (= 4.1.13)
-      activerecord (= 4.1.13)
-      activesupport (= 4.1.13)
+    rails (4.1.10)
+      actionmailer (= 4.1.10)
+      actionpack (= 4.1.10)
+      actionview (= 4.1.10)
+      activemodel (= 4.1.10)
+      activerecord (= 4.1.10)
+      activesupport (= 4.1.10)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.13)
+      railties (= 4.1.10)
       sprockets-rails (~> 2.0)
-    rails-i18n (4.0.5)
+    rails-i18n (4.0.4)
       i18n (~> 0.6)
       railties (~> 4.0)
-    railties (4.1.13)
-      actionpack (= 4.1.13)
-      activesupport (= 4.1.13)
+    railties (4.1.10)
+      actionpack (= 4.1.10)
+      activesupport (= 4.1.10)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.0.0)
     rake (10.4.2)
-    ransack (1.7.0)
+    ransack (1.6.6)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
       i18n
       polyamorous (~> 1.2)
     rdoc (4.2.0)
-      json (~> 1.4)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
+    ref (1.0.5)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
     rspec-autotest (1.0.0)
       rspec-core (>= 2.99.0.beta1, < 4.0.0)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-rails (3.3.3)
-      actionpack (>= 3.0, < 4.3)
-      activesupport (>= 3.0, < 4.3)
-      railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    rubocop (0.34.2)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-rails (3.1.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    rubocop (0.30.0)
       astrolabe (~> 1.3)
-      parser (>= 2.2.2.5, < 3.0)
+      parser (>= 2.2.0.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.4)
-    rubocop-rspec (1.3.1)
+    rubocop-rspec (1.2.2)
     ruby-progressbar (1.7.5)
-    rubytree (0.9.6)
+    rubytree (0.9.4)
       json (~> 1.8)
-      structured_warnings (~> 0.2)
+      structured_warnings (~> 0.1)
     rubyzip (1.1.7)
     sass (3.2.19)
     sass-rails (4.0.5)
@@ -245,17 +265,17 @@ GEM
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
-    selenium-webdriver (2.48.1)
+    selenium-webdriver (2.45.0)
       childprocess (~> 0.5)
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
-    simplecov (0.10.0)
+    simplecov (0.9.2)
       docile (~> 1.1.0)
-      json (~> 1.8)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    slim (3.0.6)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.9.0)
+    simplecov-html (0.9.0)
+    slim (3.0.3)
       temple (~> 0.7.3)
       tilt (>= 1.3.3, < 2.1)
     slop (3.6.0)
@@ -263,13 +283,15 @@ GEM
       bcrypt (~> 3.1)
       oauth (~> 0.4, >= 0.4.4)
       oauth2 (>= 0.8.0)
-    spring (1.4.0)
-    sprockets (2.12.4)
+    spoon (0.0.4)
+      ffi
+    spring (1.3.4)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.3.3)
+    sprockets-rails (2.2.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -278,9 +300,10 @@ GEM
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     structured_warnings (0.2.0)
-    temple (0.7.6)
+    temple (0.7.5)
     thor (0.19.1)
     thread_safe (0.3.5)
+    thread_safe (0.3.5-java)
     tilt (1.4.1)
     tubesock (0.2.5)
       rack (>= 1.5.0)
@@ -289,23 +312,26 @@ GEM
       coffee-rails
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.7.2)
+    uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    web-console (2.2.1)
+    web-console (2.1.2)
       activemodel (>= 4.0)
       binding_of_caller (>= 0.7.2)
       railties (>= 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-    websocket (1.2.2)
+    websocket (1.2.1)
     websocket-driver (0.6.2)
       websocket-extensions (>= 0.1.0)
+    websocket-driver (0.6.2-java)
+      websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
     will_paginate (3.0.7)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
@@ -366,3 +392,6 @@ DEPENDENCIES
   uglifier (>= 1.3.0)
   web-console (~> 2.0)
   will_paginate (~> 3.0)
+
+BUNDLED WITH
+   1.10.6