diff --git a/.gitignore b/.gitignore
index d2f0d02a7..6fd838d1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,13 @@
 .rspec
 results
 tags
 .*.sw[op]
 
 # Now that there is a gemfile, RVM ignores rvmrc in parent directories, so a local one is required
 # to work around that.  Which we don't want committed, so we can ignore it here.
 /.rvmrc
+.bundle/
+ext/packaging/
+pkg/
+vendor/
+Gemfile.lock
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..5219e13c6
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,11 @@
+language: ruby
+bundler_args: --without development
+script: "bundle exec rake spec SPEC_OPTS='--color --format documentation'"
+notifications:
+  email: false
+rvm:
+  - 1.8.7
+  - 1.9.3
+matrix:
+  allow_failures:
+    - rvm: 1.9.3
diff --git a/Gemfile b/Gemfile
index 9f4109aba..fb9b6c849 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,32 +1,48 @@
 source :rubygems
 
-gemspec
+def location_for(place)
+  if place =~ /^(git:[^#]*)#(.*)/
+    [{ :git => $1, :branch => $2, :require => false }]
+  elsif place =~ /^file:\/\/(.*)/
+    ['>= 0', { :path => File.expand_path($1), :require => false }]
+  else
+    [place, { :require => false }]
+  end
+end
 
 group(:development, :test) do
-  gem "facter", "~> 1.6.4", :require => false
-  gem "rack", "~> 1.4.1", :require => false
-  gem "rspec", "~> 2.10.0", :require => false
+  gem "puppet", *location_for('file://.')
+  gem "facter", *location_for(ENV['FACTER_LOCATION'] || '~> 1.6')
+  gem "hiera", *location_for(ENV['HIERA_LOCATION'] || '~> 1.0')
+  gem "rack", "~> 1.4", :require => false
+  gem "rake", :require => false
+  gem "rspec", "~> 2.11.0", :require => false
   gem "mocha", "~> 0.10.5", :require => false
+  gem "activerecord", *location_for('~> 3.0.7')
+  gem "couchrest", *location_for('~> 1.0')
+  gem "net-ssh", *location_for('~> 2.1')
+  gem "puppetlabs_spec_helper"
+  gem "sqlite3"
+  gem "stomp"
+  gem "tzinfo"
 end
 
 platforms :mswin, :mingw do
-  # See http://jenkins.puppetlabs.com/ for current Gem listings for the Windows
-  # CI Jobs.
   gem "sys-admin", "~> 1.5.6", :require => false
   gem "win32-api", "~> 1.4.8", :require => false
   gem "win32-dir", "~> 0.3.7", :require => false
   gem "win32-eventlog", "~> 0.5.3", :require => false
   gem "win32-process", "~> 0.6.5", :require => false
   gem "win32-security", "~> 0.1.4", :require => false
   gem "win32-service", "~> 0.7.2", :require => false
   gem "win32-taskscheduler", "~> 0.2.2", :require => false
   gem "win32console", "~> 1.3.2", :require => false
   gem "windows-api", "~> 0.4.1", :require => false
   gem "windows-pr", "~> 1.2.1", :require => false
 end
 
 if File.exists? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)
 end
 
 # vim:filetype=ruby
diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index e457e0926..000000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,44 +0,0 @@
-PATH
-  remote: .
-  specs:
-    puppet (2.7.19)
-      facter (~> 1.5)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.1.3)
-    facter (1.6.11)
-    metaclass (0.0.1)
-    mocha (0.10.5)
-      metaclass (~> 0.0.1)
-    rack (1.4.1)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  facter (~> 1.6.4)
-  mocha (~> 0.10.5)
-  puppet!
-  rack (~> 1.4.1)
-  rspec (~> 2.10.0)
-  sys-admin (~> 1.5.6)
-  win32-api (~> 1.4.8)
-  win32-dir (~> 0.3.7)
-  win32-eventlog (~> 0.5.3)
-  win32-process (~> 0.6.5)
-  win32-security (~> 0.1.4)
-  win32-service (~> 0.7.2)
-  win32-taskscheduler (~> 0.2.2)
-  win32console (~> 1.3.2)
-  windows-api (~> 0.4.1)
-  windows-pr (~> 1.2.1)
diff --git a/puppet.gemspec b/puppet.gemspec
index abc9e0c1c..14b06f8e7 100644
--- a/puppet.gemspec
+++ b/puppet.gemspec
@@ -1,32 +1,39 @@
 # -*- encoding: utf-8 -*-
 
+require File.expand_path("../lib/puppet/version", __FILE__)
+
 Gem::Specification.new do |s|
   s.name = "puppet"
-  s.version = "2.7.19"
+  version = Puppet.version
+  if mdata = version.match(/(\d+\.\d+\.\d+)/)
+    s.version = mdata[1]
+  else
+    s.version = version
+  end
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Puppet Labs"]
   s.date = "2012-08-17"
   s.description = "Puppet, an automated configuration management tool"
   s.email = "puppet@puppetlabs.com"
   s.executables = ["puppet"]
   s.files = ["bin/puppet"]
   s.homepage = "http://puppetlabs.com"
   s.rdoc_options = ["--title", "Puppet - Configuration Management", "--main", "README", "--line-numbers"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "puppet"
   s.rubygems_version = "1.8.24"
   s.summary = "Puppet, an automated configuration management tool"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<facter>, ["~> 1.5"])
     else
       s.add_dependency(%q<facter>, ["~> 1.5"])
     end
   else
     s.add_dependency(%q<facter>, ["~> 1.5"])
   end
 end