diff --git a/.rvmrc b/.rvmrc
new file mode 100644
index 0000000..0921c1a
--- /dev/null
+++ b/.rvmrc
@@ -0,0 +1 @@
+rvm gemset use heroku_san --create
diff --git a/Gemfile b/Gemfile
index 69c7d41..fecc2ed 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,23 @@
-source :rubygems
+source 'https://rubygems.org'
 
 # Specify dependencies in heroku_san.gemspec
-gemspec
\ No newline at end of file
+gemspec
+
+group :development do
+  gem 'rails', '>= 2'
+  gem 'rspec'
+  gem 'aruba'
+  gem 'cucumber'
+  gem 'rake'
+  gem 'bundler', '~> 1.1'
+  gem 'git-smart'
+  gem 'godot'
+  gem 'guard'
+  gem 'rb-inotify', :require => false
+  gem 'rb-fsevent', :require => false
+  gem 'rb-fchange', :require => false
+  gem 'terminal-notifier-guard'
+  gem 'guard-rspec'
+  gem 'guard-bundler'
+  gem 'guard-cucumber'
+end
diff --git a/Guardfile b/Guardfile
new file mode 100644
index 0000000..81eb424
--- /dev/null
+++ b/Guardfile
@@ -0,0 +1,21 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'bundler' do
+  watch('Gemfile')
+  watch(/^.+\.gemspec/)
+end
+
+guard 'rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch(%r{^spec/fixtures/(.+)\.yml$})                  { "spec" }
+end
+
+guard 'cucumber', :cli => '--tags @fast' 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
diff --git a/heroku_san.gemspec b/heroku_san.gemspec
index 026383e..d3e0f78 100644
--- a/heroku_san.gemspec
+++ b/heroku_san.gemspec
@@ -29,14 +29,6 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<heroku-api>, ['>= 0.1.2'])
       s.add_runtime_dependency(%q<rake>)
-      s.add_development_dependency(%q<rails>, ['>= 2'])
-      s.add_development_dependency(%q<rspec>)
-      s.add_development_dependency(%q<aruba>)
-      s.add_development_dependency(%q<cucumber>)
-      s.add_development_dependency(%q<rake>)
-      s.add_development_dependency(%q<bundler>, ['~> 1.1  '])
-      s.add_development_dependency('git-smart')
-      s.add_development_dependency('godot')
     else
       s.add_dependency(%q<rails>, ['>= 2'])
       s.add_dependency(%q<heroku-api>, ['>= 0.1.2'])
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 66039b0..d782011 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -10,13 +10,6 @@
 Dir[File.join(SPEC_ROOT, "support/**/*.rb")].each {|f| require f}
 
 RSpec.configure do |config|
-  # == Mock Framework
-  #
-  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
   config.mock_with :rspec
 end