diff --git a/.gitignore b/.gitignore
index f99038e..9abfa47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ test.rb
 neo4j
 /spec/reports
 /spec/dummy/log/*
+/tmp
 
 /log
 
diff --git a/Gemfile.lock b/Gemfile.lock
index f2f1db2..74495a8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -34,9 +34,25 @@ GEM
     diff-lcs (1.2.5)
     factory_girl (4.3.0)
       activesupport (>= 3.0.0)
+    ffi (1.9.3)
+    formatador (0.2.4)
+    guard (1.8.3)
+      formatador (>= 0.2.4)
+      listen (~> 1.3)
+      lumberjack (>= 1.0.2)
+      pry (>= 0.9.10)
+      thor (>= 0.14.6)
+    guard-rspec (3.0.3)
+      guard (>= 1.8)
+      rspec (~> 2.13)
     httpclient (2.3.4.1)
     i18n (0.6.9)
     json (1.8.1)
+    listen (1.3.1)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      rb-kqueue (>= 0.2)
+    lumberjack (1.0.4)
     method_source (0.8.2)
     minitest (4.7.5)
     multi_json (1.8.4)
@@ -54,6 +70,11 @@ GEM
       method_source (~> 0.8)
       slop (~> 3.4)
     rake (10.1.1)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.3)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.0)
+      ffi (>= 0.5.0)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
@@ -64,6 +85,7 @@ GEM
     rspec-mocks (2.13.1)
     rubyzip (0.9.9)
     slop (3.4.7)
+    thor (0.18.1)
     thread_safe (0.1.3)
       atomic
     timecop (0.7.1)
@@ -76,6 +98,8 @@ DEPENDENCIES
   ci_reporter
   deja!
   factory_girl
+  guard (~> 1.8.3)
+  guard-rspec (~> 3.0.3)
   neo4j-cypher!
   neography (~> 1.1.3)
   pry
diff --git a/Guardfile b/Guardfile
new file mode 100644
index 0000000..a4c5ad2
--- /dev/null
+++ b/Guardfile
@@ -0,0 +1,10 @@
+guard :rspec do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^spec/support/(.+)\.rb$}) { 'spec' }
+  watch('spec/spec_helper.rb') { 'spec' }
+
+  watch(%r{^lib/(.+)\.rb$}) do |m|
+    f = "spec/#{m[1]}_spec.rb"
+    File.exist?(f) ? f : 'spec'
+  end
+end
diff --git a/deja.gemspec b/deja.gemspec
index ae5fe03..8b71fb1 100644
--- a/deja.gemspec
+++ b/deja.gemspec
@@ -18,9 +18,11 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_development_dependency 'factory_girl'
+  s.add_development_dependency 'guard', '~> 1.8.3'
+  s.add_development_dependency 'guard-rspec', '~> 3.0.3'
   s.add_development_dependency 'pry'
-  s.add_development_dependency 'rspec', '~>2.13.0'
-	s.add_development_dependency 'ci_reporter'
+  s.add_development_dependency 'rspec', '~> 2.13.0'
+  s.add_development_dependency 'ci_reporter'
   s.add_development_dependency 'timecop'
 
   s.add_dependency 'activemodel', '~> 4.0.0'
diff --git a/lib/deja.rb b/lib/deja.rb
index f4ac936..18d4eef 100644
--- a/lib/deja.rb
+++ b/lib/deja.rb
@@ -39,7 +39,7 @@ class << self; attr_accessor :neo, :tx, :batch ; end
 
   config_hash = YAML.load_file("#{File.dirname(File.expand_path(__FILE__))}/config/graph.yml")
   Neography.configure do |config|
-    config_hash[CB.environment].each do |k, v|
+    config_hash[ENV['RAILS_ENV'] || 'development'].each do |k, v|
       config.send("#{k}=".to_sym, v)
     end
   end