diff --git a/Gemfile b/Gemfile
index 62e0820d..4386ea6c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,23 @@
 source "https://rubygems.org"
 
-gem "github-pages"
-# gem "jekyll-archives"
-gem "wdm", "~> 0.1.0" if Gem.win_platform?
\ No newline at end of file
+# Hello! This is where you manage which Jekyll version is used to run.
+# When you want to use a different version, change it below, save the
+# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
+#
+#     bundle exec jekyll serve
+#
+# This will help ensure the proper Jekyll version is running.
+# Happy Jekylling!
+
+gem "github-pages", group: :jekyll_plugins
+
+# If you want to use Jekyll native, remove the "gem "github-pages"" line
+# and uncomment the line below. To upgrade, run `bundle update`.
+# gem "jekyll"
+
+gem "wdm", "~> 0.1.0" if Gem.win_platform?
+
+# If you have any plugins, put them here!
+group :jekyll_plugins do
+  # gem "jekyll-archives"
+end
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index 533608b0..6a5ea60a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -21,7 +21,7 @@ GEM
     ffi (1.9.14)
     ffi (1.9.14-x64-mingw32)
     gemoji (2.1.0)
-    github-pages (88)
+    github-pages (89)
       activesupport (= 4.2.7)
       github-pages-health-check (= 1.1.0)
       jekyll (= 3.1.6)
@@ -35,7 +35,7 @@ GEM
       jekyll-sass-converter (= 1.3.0)
       jekyll-seo-tag (= 2.0.0)
       jekyll-sitemap (= 0.10.0)
-      jemoji (= 0.6.2)
+      jemoji (= 0.7.0)
       kramdown (= 1.11.1)
       liquid (= 3.0.6)
       listen (= 3.0.6)
@@ -82,7 +82,8 @@ GEM
     jekyll-sitemap (0.10.0)
     jekyll-watch (1.5.0)
       listen (~> 3.0, < 3.1)
-    jemoji (0.6.2)
+    jemoji (0.7.0)
+      activesupport (~> 4.0)
       gemoji (~> 2.0)
       html-pipeline (~> 2.2)
       jekyll (>= 3.0)
diff --git a/_config.yml b/_config.yml
index 5d0af23c..51c15b6a 100644
--- a/_config.yml
+++ b/_config.yml
@@ -231,22 +231,20 @@ timezone: America/New_York # http://en.wikipedia.org/wiki/List_of_tz_database_ti
 
 
 # Plugins
-gems:
-  - jekyll-paginate
-  - jekyll-sitemap
-  - jekyll-gist
-  - jekyll-feed
-  - jemoji
-  - jekyll-redirect-from
+# gems:
+#   - jekyll-paginate
+#   - jekyll-sitemap
+#   - jekyll-gist
+#   - jekyll-feed
+#   - jemoji
 
 # mimic GitHub Pages with --safe
-whitelist:
-  - jekyll-paginate
-  - jekyll-sitemap
-  - jekyll-gist
-  - jekyll-feed
-  - jemoji
-  - jekyll-redirect-from
+# whitelist:
+#   - jekyll-paginate
+#   - jekyll-sitemap
+#   - jekyll-gist
+#   - jekyll-feed
+#   - jemoji
 
 
 # Archives