diff --git a/octopress/Gemfile b/octopress/Gemfile
index b347c59..accafec 100644
--- a/octopress/Gemfile
+++ b/octopress/Gemfile
@@ -1,17 +1,23 @@
-source 'http://rubygems.org'
+source :rubygems
+gemspec
 
-# The gems you'll need for generating your site on your development machine.
-# The deployment strategy you use determines what you need in production, if
-# anything.
-#
-group :development do
-  gem 'jekyll', '~> 0.11.0'
-  gem 'compass', '~> 0.11.0'
-end
+gem 'rake'
+gem 'rdoc'
 
-# If your deployment target has you running Ruby, you might have some gems
-# listed here. This will be the case if you deploy to Heroku.
-#
-group :production do
+# group :debug do
+#   gem 'ruby-debug19'
+# end
 
-end
+group :test do
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'guard-cucumber'
+  gem 'fakefs'
+  gem 'webmock'
+  gem 'aruba', '~> 0.4.11'
+  #if we are on travis ci ignore these
+  unless ENV["CI"]
+    gem 'rb-fsevent'
+    gem 'ruby_gntp', '~> 0.3.4'
+  end
+end
\ No newline at end of file
diff --git a/octopress/Guardfile b/octopress/Guardfile
index f7d6c52..6dca2fb 100644
--- a/octopress/Guardfile
+++ b/octopress/Guardfile
@@ -1,15 +1,17 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
-
-guard 'rspec', :version => 2 do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
+group :specs do
+  guard 'rspec', :version => 2 do
+    watch(%r{^spec/.+_spec\.rb$})
+    watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+    watch('spec/spec_helper.rb')  { "spec" }
+  end
 end
 
-
-guard 'cucumber' do
-  watch(%r{^features/.+\.feature$})
-  watch(%r{^features/support/.+$})          { 'features' }
-  watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
+group :cukes do
+  guard 'cucumber' do
+    watch(%r{^features/.+\.feature$})
+    watch(%r{^features/support/.+$})          { 'features' }
+    watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
+  end
 end