Merge pull request #81 from jasnow/master

Upgraded simplecov and database_cleaner gems then refreshed Gemfile.lock file

Gemfile

@@ -27,12 +27,12 @@ end
 
 gem 'gauntlt'
 
-gem 'simplecov', '0.8.0.pre2', :require => false, :group => :test
+gem 'simplecov', :require => false, :group => :test
 
 group :development, :test do
   gem 'launchy'
   gem 'capybara'
-  gem 'database_cleaner', '< 1.1.0'
+  gem 'database_cleaner'
   gem 'poltergeist'
   gem 'rspec-rails'
 end

Gemfile.lock

@@ -80,7 +80,7 @@ GEM
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.0.2)
     daemons (1.1.9)
-    database_cleaner (1.0.1)
+    database_cleaner (1.2.0)
     debug_inspector (0.0.2)
     diff-lcs (1.2.5)
     docile (1.1.1)
@@ -145,7 +145,6 @@ GEM
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    lockfile (2.1.0)
     lumberjack (1.0.4)
     mail (2.4.4)
       i18n (>= 0.4.0)
@@ -238,12 +237,11 @@ GEM
       sass (>= 3.1.10)
       tilt (~> 1.3)
     sexp_processor (4.4.1)
-    simplecov (0.8.0.pre2)
+    simplecov (0.8.2)
       docile (~> 1.1.0)
-      lockfile (>= 2.1.0)
       multi_json
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
     sinatra (1.4.4)
       rack (~> 1.4)
       rack-protection (~> 1.4)
@@ -303,7 +301,7 @@ DEPENDENCIES
   bundler-audit
   capybara
   coffee-rails
-  database_cleaner (< 1.1.0)
+  database_cleaner
   execjs
   foreman
   gauntlt
@@ -324,7 +322,7 @@ DEPENDENCIES
   rb-fsevent
   rspec-rails
   sass-rails
-  simplecov (= 0.8.0.pre2)
+  simplecov
   sqlite3
   therubyracer
   travis-lint