diff --git a/.rubocop.yml b/.rubocop.yml
index 05f8ab4..a02f5ed 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -15,6 +15,8 @@ Style/IndentHash:
   EnforcedStyle: consistent
 
 Style/AlignHash:
+  Severity: fatal
+  Enabled: true
   EnforcedHashRocketStyle: table
   EnforcedColonStyle: table
 
@@ -37,3 +39,9 @@ Style/DotPosition:
 
 Style/DoubleNegation:
   Enabled: false
+
+Style/SpaceAroundOperators:
+  # When true, allows most uses of extra spacing if the intent is to align
+  # with an operator on the previous or next line, not counting empty lines
+  # or comment lines.
+  AllowForAlignment: true
diff --git a/Gemfile b/Gemfile
index f786077..f4cad89 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,10 +22,10 @@ gem 'newrelic_rpm'
 
 group :development do
   gem 'shotgun'
-  gem 'rubocop'
 end
 
 group :test do
+  gem 'rubocop'
   gem 'sqlite3', platform: :ruby
   gem 'jdbc-sqlite3', platform: :jruby
   gem 'rspec'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2f55313..92faf48 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.4.0)
-    airbrake (5.6.0)
+    airbrake (5.6.1)
       airbrake-ruby (~> 1.6)
     airbrake-ruby (1.6.0)
     ast (2.3.0)
@@ -46,7 +46,7 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.10)
-    macmillan-utils (1.0.31)
+    macmillan-utils (1.0.32)
       codeclimate-test-reporter
       multi_test
       rspec
@@ -91,7 +91,7 @@ GEM
       rack (>= 1.0)
     rainbow (2.1.0)
     rake (11.3.0)
-    rb-fsevent (0.9.7)
+    rb-fsevent (0.9.8)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
     rspec (3.5.0)
diff --git a/HISTORY b/HISTORY
index f82fe36..e71d0be 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,8 @@
+= 3.1.4 / 2016-10-28
+
+  * Update all dependent gems.
+  * Switch docker container image to be based off alpine linux - this makes the resulting image much smaller.
+
 = 3.1.3 / 2016-06-29
 
   * Update all dependent gems - including a major security update for nokogiri.
diff --git a/lib/bandiera/version.rb b/lib/bandiera/version.rb
index 5d4506a..7c745a6 100644
--- a/lib/bandiera/version.rb
+++ b/lib/bandiera/version.rb
@@ -1,3 +1,3 @@
 module Bandiera
-  VERSION = '3.1.3'.freeze
+  VERSION = '3.1.4'.freeze
 end