diff --git a/Gemfile.lock b/Gemfile.lock
index 2921cad8135495899af403e95371e66b0b8d7411..362d873e186c32f082e2948a8b6514c02f32d13b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,34 +4,42 @@ GEM
     anemone (0.7.2)
       nokogiri (>= 1.3.0)
       robotex (>= 1.0.0)
-    chunky_png (1.2.7)
+    chunky_png (1.2.8)
     classifier (1.3.3)
       fast-stemmer (>= 1.0.0)
+    colorator (0.1)
+    commander (4.1.3)
+      highline (~> 1.6.11)
     compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
     directory_watcher (1.4.1)
-    fast-stemmer (1.0.1)
-    fssm (0.2.9)
-    jekyll (0.12.0)
+    fast-stemmer (1.0.2)
+    fssm (0.2.10)
+    highline (1.6.19)
+    jekyll (1.0.2)
       classifier (~> 1.3)
-      directory_watcher (~> 1.1)
-      kramdown (~> 0.13.4)
+      colorator (~> 0.1)
+      commander (~> 4.1.3)
+      directory_watcher (~> 1.4.1)
+      kramdown (~> 1.0.2)
       liquid (~> 2.3)
       maruku (~> 0.5)
-      pygments.rb (~> 0.3.2)
-    kramdown (0.13.8)
-    liquid (2.4.1)
+      pygments.rb (~> 0.5.0)
+      safe_yaml (~> 0.7.0)
+    kramdown (1.0.2)
+    liquid (2.5.0)
     maruku (0.6.1)
       syntax (>= 1.0.0)
     nokogiri (1.5.9)
     posix-spawn (0.3.6)
-    pygments.rb (0.3.7)
+    pygments.rb (0.5.0)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     robotex (1.0.0)
-    sass (3.2.5)
+    safe_yaml (0.7.1)
+    sass (3.2.9)
     syntax (1.0.0)
     yajl-ruby (1.1.0)
 
diff --git a/README.md b/README.md
index 015b73f11f27196c538da090084f44716e14d6b9..6da1b267ad1b425d6fdd3c2597ae180ce92f74b5 100644
--- a/README.md
+++ b/README.md
@@ -15,9 +15,10 @@ This site is the product of a community of people who want to help to make web a
 ========
 In order to contribute to the website’s codebase, you’ll need to know a bit about [Jekyll](https://github.com/mojombo/jekyll), [Compass](http://compass-style.org), [Sass](http://sass-lang.com), [Twitter Bootstrap](http://twitter.github.com/bootstrap), [Bash](http://www.gnu.org/software/bash/manual/bashref.html#What-is-Bash_003f) and [Markdown](http://daringfireball.net/projects/markdown/). You'll also need to know how to install *[Ruby Gems](https://rvm.io)* and of course have *[Ruby](http://www.ruby-lang.org/en/downloads/)* installed on your machine.
 
-###Gems
+###Gems Installation
 
-Run the following to install the necessary gems for **A11Y Project**. (**Hint**: All the cool kids use [ruby version manager](https://rvm.io) to organize ``gemset`` dependencies):
+Use the ``bundle`` command to install the necessary gems for the **A11Y Project**. (**Hint**: All the cool kids use [ruby version manager](https://rvm.io) to organize ``gemset`` dependencies):
+If you don't have [bundler](http://gembundler.com) installed you'll need to run ``gem install bundler`` before using ``bundle``.
 
     $ bundle
 
@@ -49,9 +50,9 @@ The following ``rake`` tasks are available and are used for testing the site loc
     rake build        # Build site with Jekyll
     rake check_links  # Check links for site already running on localhost:4000
     rake clean        # Clean up generated site
-    rake server       # Start server with --auto
+    rake server       # Start the server
     rake check        # Check if site will run on Github pages
 
 **Local Server**
 
-Trigger the local server by executing the ``rake server`` task. Your local copy will now be accessible at `http://localhost:4000`. You should see a message thats says ``INFO  WEBrick::HTTPServer#start: pid=62675 port=4000`` which means your local copy can now be found at ``port 4000 ``.
+Trigger the local server by executing the ``rake server`` task. Your local copy will now be accessible at `http://localhost:4000`.
diff --git a/Rakefile b/Rakefile
index ac62be06eff2cf7dfcefda9780e51d6b3adf1b11..ac5cef7109a6b6a71fb7c7b88cd4b54fa97cbcb6 100755
--- a/Rakefile
+++ b/Rakefile
@@ -8,7 +8,7 @@ end
 desc 'Build site with Jekyll'
 task :build => :clean do
   compass
-  jekyll
+  jekyll('build')
 end
 
 desc 'Start server with --auto'
@@ -18,7 +18,7 @@ end
 
 desc 'Check if site will run on Github pages'
 task :check => :clean do
-  jekyll('--safe')
+  jekyll('doctor --safe')
 end
 
 
@@ -65,5 +65,5 @@ def compass(opts = '')
 end
 
 def jekyll_compass
-  sh 'compass watch & jekyll --server --auto'
+  sh 'compass watch & jekyll serve --watch'
 end
\ No newline at end of file