diff --git a/.gitignore b/.gitignore
index 4040c6c..d87d4be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,17 @@
 *.gem
+*.rbc
 .bundle
+.config
+.yardoc
 Gemfile.lock
-pkg/*
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
diff --git a/.rvmrc b/.rvmrc
new file mode 100644
index 0000000..903e94e
--- /dev/null
+++ b/.rvmrc
@@ -0,0 +1 @@
+rvm --create gemset use rspec-rails-caching
diff --git a/Gemfile b/Gemfile
index 3ecb7fe..641039b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
-# Specify your gem's dependencies in rspec_caching_test.gemspec
-gemspec
\ No newline at end of file
+# Specify your gem's dependencies in rspec-rails-caching.gemspec
+gemspec
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..35d9d8a
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,22 @@
+Copyright (c) 2012 Andrew Vit
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/Rakefile b/Rakefile
index 2995527..f57ae68 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1 +1,2 @@
+#!/usr/bin/env rake
 require "bundler/gem_tasks"
diff --git a/rspec-caching.gemspec b/rspec-caching.gemspec
deleted file mode 100644
index 16666b2..0000000
--- a/rspec-caching.gemspec
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "rspec-rails-caching/version"
-
-Gem::Specification.new do |s|
-  s.name        = "rspec-rails-caching"
-  s.version     = RSpecRailsCaching::VERSION
-  s.authors     = ["Andrew Vit"]
-  s.email       = ["andrew@avit.ca"]
-  s.homepage    = "https://github.com/avit/rspec-rails-caching"
-  s.summary     = %q{RSpec Rails Caching}
-  s.description = %q{RSpec helper for testing page and action caching in Rails}
-
-  s.rubyforge_project = "rspec-rails-caching"
-  s.add_dependency "rails", ">=3.0.0"
-  s.add_dependency "rspec", ">=2.8.0"
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
-end
diff --git a/rspec-rails-caching.gemspec b/rspec-rails-caching.gemspec
new file mode 100644
index 0000000..b79f9d1
--- /dev/null
+++ b/rspec-rails-caching.gemspec
@@ -0,0 +1,20 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/rspec-rails-caching/version', __FILE__)
+
+Gem::Specification.new do |gem|
+  gem.name        = "rspec-rails-caching"
+  gem.version     = RSpecRailsCaching::VERSION
+  gem.authors     = ["Andrew Vit"]
+  gem.email       = ["andrew@avit.ca"]
+  gem.homepage    = "https://github.com/avit/rspec-rails-caching"
+  gem.summary     = %q{RSpec Rails Caching}
+  gem.description = %q{RSpec helper for testing page and action caching in Rails}
+
+  gem.add_dependency "rails", ">=3.0.0"
+  gem.add_dependency "rspec", ">=2.8.0"
+
+  gem.files         = `git ls-files`.split($\)
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.require_paths = ["lib"]
+end