diff --git a/Gemfile.lock b/Gemfile.lock
index c23307d..fcfba32 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shh (0.2.1)
+    shh (0.3.0)
       activesupport (~> 3)
       crypt19 (~> 1)
       flat_hash (~> 0)
@@ -14,37 +14,46 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.1)
+    activesupport (3.2.2)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     crypt19 (1.2.1)
     diff-lcs (1.1.3)
+    ffi (1.0.11)
     flat_hash (0.1.0)
       grit (~> 2)
     grit (2.4.1)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
+    guard (1.0.1)
+      ffi (>= 0.5.0)
+      thor (~> 0.14.6)
+    guard-rspec (0.6.0)
+      guard (>= 0.10.0)
     highline (1.6.11)
     i18n (0.6.0)
-    mime-types (1.17.2)
+    mime-types (1.18)
     multi_json (1.1.0)
     rake (0.9.2.2)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
     shell_shock (0.0.5)
     splat (0.1.4)
+    thor (0.14.6)
     uuidtools (2.1.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  rake (~> 0.8)
+  guard
+  guard-rspec
+  rake
   rspec (~> 2)
   shh!
diff --git a/Guardfile b/Guardfile
new file mode 100644
index 0000000..d8c7bcf
--- /dev/null
+++ b/Guardfile
@@ -0,0 +1,7 @@
+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" }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+end
+
diff --git a/Rakefile b/Rakefile
index 700b3dc..19d1b94 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,10 +1,6 @@
-begin
-  require 'gemesis/rake'
-rescue Exception
-  puts "gemesis related tasks will only be available if you 'gem install gemesis'"
-end
+require 'bundler/gem_tasks'
 
 desc 'execute specifications'
 task :test do
   sh 'rspec spec'
-end
\ No newline at end of file
+end
diff --git a/autotest/discover.rb b/autotest/discover.rb
deleted file mode 100644
index 24dd9b7..0000000
--- a/autotest/discover.rb
+++ /dev/null
@@ -1 +0,0 @@
-Autotest.add_discovery { "rspec2" }
\ No newline at end of file
diff --git a/shh.gemspec b/shh.gemspec
index 4ab6513..eaca075 100644
--- a/shh.gemspec
+++ b/shh.gemspec
@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = 'shh'
-  spec.version = '0.2.1'
+  spec.version = '0.3.0'
   spec.summary = "command line utility for managing secure information"
   spec.description = <<-EOF
 A command line utility that manages accounts and passwords as individual encypted files
@@ -23,6 +23,8 @@ EOF
   spec.add_dependency 'i18n', '~>0'
   spec.add_dependency 'crypt19', '~>1'
 
-  spec.add_development_dependency 'rake', '~>0.8'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~>2'
+  spec.add_development_dependency 'guard'
+  spec.add_development_dependency 'guard-rspec'
 end