Rebuilt Gemfile.lock file; Resync'ed with upstream repo

Gemfile.lock

@@ -48,6 +48,7 @@ GEM
       ffi (~> 1.9.10)
       rspec-expectations (>= 2.99)
       thor (~> 0.19)
+    ast (2.3.0)
     backports (3.10.3)
     bcrypt (3.1.11)
     better_errors (2.4.0)
@@ -82,7 +83,7 @@ GEM
     concurrent-ruby (1.0.5)
     contracts (0.16.0)
     crack (0.3.1)
-    crass (1.0.2)
+    crass (1.0.3)
     cucumber (3.0.2)
       builder (>= 2.1.2)
       cucumber-core (~> 3.0.0)
@@ -181,6 +182,9 @@ GEM
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
+    parallel (1.12.0)
+    parser (2.4.0.2)
+      ast (~> 2.3)
     poltergeist (1.16.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
@@ -188,7 +192,8 @@ GEM
     powder (0.3.3)
       thor (>= 0.11.5)
     power_assert (1.1.1)
-    pry (0.11.2)
+    powerpack (0.1.1)
+    pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     pry-rails (0.3.6)
@@ -223,6 +228,8 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
+    rainbow (2.2.2)
+      rake
     raindrops (0.19.0)
     rake (12.2.1)
     rb-fsevent (0.10.2)
@@ -253,7 +260,15 @@ GEM
       rspec-mocks (~> 3.7.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.0)
+    rubocop (0.51.0)
+      parallel (~> 1.10)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-prof (0.16.2)
+    ruby-progressbar (1.9.0)
     ruby_dep (1.5.0)
     sass (3.5.3)
       sass-listen (~> 4.0.0)
@@ -297,6 +312,7 @@ GEM
       thread_safe (~> 0.1)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
+    unicode-display_width (1.3.0)
     unicorn (5.3.1)
       kgio (~> 2.6)
       raindrops (~> 0.7)
@@ -342,6 +358,7 @@ DEPENDENCIES
   rb-fsevent
   responders
   rspec-rails
+  rubocop
   ruby-prof
   sass-rails
   simplecov