Merge pull request #1176 from MrJoy/update_dependencies_take2

Updating deps.  Notable changes:

Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    chunky_png (1.2.6)
+    chunky_png (1.2.7)
     classifier (1.3.3)
       fast-stemmer (>= 1.0.0)
     coderay (1.0.9)
@@ -21,7 +21,7 @@ GEM
       multi_json (~> 1.0)
     fast-stemmer (1.0.2)
     ffi (1.2.0)
-    fssm (0.2.9)
+    fssm (0.2.10)
     guard (1.6.2)
       listen (>= 0.6.0)
       lumberjack (>= 1.0.2)
@@ -36,7 +36,7 @@ GEM
       guard (>= 0.2.1)
     guard-shell (0.5.1)
       guard (>= 1.1.0)
-    haml (3.1.7)
+    haml (3.1.8)
     highline (1.6.16)
     jekyll (1.0.0.beta2)
       classifier (~> 1.3)
@@ -76,12 +76,12 @@ GEM
     redcarpet (2.2.2)
     rubypants (0.2.0)
     safe_yaml (0.7.1)
-    sass (3.2.4)
+    sass (3.2.5)
     sass-globbing (1.0.0)
       sass (>= 3.1)
-    sinatra (1.3.3)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
+    sinatra (1.3.4)
+      rack (~> 1.4)
+      rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
     slop (3.4.3)
     stitch-rb (0.0.8)