diff --git a/.gitignore b/.gitignore
index c19618de..8f921759 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 .idea
 
 # Jekyll's build of the site
+.jekyll-metadata
 _site
 
 # Our Python environment
@@ -9,3 +10,6 @@ env34
 
 # Compiled Python
 *.pyc
+
+# Installed node packages
+node_modules
diff --git a/Gemfile.lock b/Gemfile.lock
index 0d7e5b8a..329b3d31 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,62 +1,34 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    blankslate (2.1.2.4)
-    classifier-reborn (2.0.3)
-      fast-stemmer (~> 1.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.9.1.1)
     colorator (0.1)
-    execjs (2.6.0)
-    fast-stemmer (1.0.2)
     ffi (1.9.10-x86-mingw32)
     hitimes (1.2.3-x86-mingw32)
-    jekyll (2.5.3)
-      classifier-reborn (~> 2.0)
+    jekyll (3.0.1)
       colorator (~> 0.1)
-      jekyll-coffeescript (~> 1.0)
-      jekyll-gist (~> 1.0)
-      jekyll-paginate (~> 1.0)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
       kramdown (~> 1.3)
-      liquid (~> 2.6.1)
+      liquid (~> 3.0)
       mercenary (~> 0.3.3)
-      pygments.rb (~> 0.6.0)
-      redcarpet (~> 3.1)
+      rouge (~> 1.7)
       safe_yaml (~> 1.0)
-      toml (~> 0.1.0)
-    jekyll-coffeescript (1.0.1)
-      coffee-script (~> 2.2)
-    jekyll-gist (1.3.4)
-    jekyll-paginate (1.1.0)
     jekyll-sass-converter (1.3.0)
       sass (~> 3.2)
     jekyll-watch (1.3.0)
       listen (~> 3.0)
-    kramdown (1.8.0)
-    liquid (2.6.3)
-    listen (3.0.3)
+    kramdown (1.9.0)
+    liquid (3.0.6)
+    listen (3.0.5)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     mercenary (0.3.5)
-    parslet (1.5.0)
-      blankslate (~> 2.0)
-    posix-spawn (0.3.11)
-    pygments.rb (0.6.3)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.2.0)
     rb-fsevent (0.9.6)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    redcarpet (3.3.3)
+    rouge (1.10.1)
     safe_yaml (1.0.4)
-    sass (3.4.18)
-    toml (0.1.2)
-      parslet (~> 1.5.0)
-    yajl-ruby (1.2.1)
+    sass (3.4.19)
 
 PLATFORMS
   x86-mingw32
diff --git a/tasks.py b/tasks.py
index a7b7ff90..a519ee34 100644
--- a/tasks.py
+++ b/tasks.py
@@ -2,13 +2,20 @@
 
 
 @invoke.task
+def update_dependencies():
+    print('Updating dependencies')
+    invoke.run('bundle install')
+    invoke.run('pip install -r requirements3.txt')
+
+
+@invoke.task(pre=[update_dependencies])
 def build():
-    invoke.run('jekyll build -t --config _config.yml,_config-dev.yml')
+    invoke.run('bundle exec jekyll build -t --config _config.yml,_config-dev.yml')
 
 
-@invoke.task
+@invoke.task(pre=[update_dependencies])
 def serve():
-    invoke.run('jekyll serve -t --config _config.yml,_config-dev.yml --watch --force_polling')
+    invoke.run('bundle exec jekyll serve -t --config _config.yml,_config-dev.yml --watch --force_polling')
 
 
 @invoke.task