diff --git a/.gitignore b/.gitignore
index 6867aa52d2b..f3e5a94e2b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@ doc
 # to work around that.  Which we don't want committed, so we can ignore it here.
 /.rvmrc
 Gemfile.lock
+vendor/
+.bundle/
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000000..3eec50c542a
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,12 @@
+language: ruby
+bundler_args: --without development
+script: "bundle exec rake spec SPEC_OPTS='--color --format documentation'"
+notifications:
+  email: false
+rvm:
+  - 1.9.3
+  - 1.8.7
+  - ruby-head
+matrix:
+  allow_failures:
+    - rvm: ruby-head
diff --git a/Gemfile b/Gemfile
index ca5e31674d6..6fdb2962c08 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,13 +1,20 @@
 source :rubygems
 
-# This is a fake version just to make bundler happy during development
-FAKE_VERSION = '9999.0.0'
+puppet_version_lib = File.expand_path("../lib/puppet/version", __FILE__)
+require puppet_version_lib
 
 def location_for(place)
   if place =~ /^(git:[^#]*)#(.*)/
     [{ :git => $1, :branch => $2, :require => false }]
   elsif place =~ /^file:\/\/(.*)/
-    [FAKE_VERSION, { :path => File.expand_path($1), :require => false }]
+    path = $1
+    puppet_version = Puppet.version
+    if match_data = puppet_version.match(/(\d+\.\d+\.\d+)/)
+      gem_puppet_version = match_data[1]
+    else
+      gem_puppet_version = puppet_version
+    end
+    [gem_puppet_version, { :path => File.expand_path(path), :require => false }]
   else
     [place, { :require => false }]
   end
@@ -18,9 +25,16 @@ group(:development, :test) do
   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", "~> 0.9.2", :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
diff --git a/README.md b/README.md
index 9aaa055a015..36cd32baa36 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 Puppet
 ======
 
+[![Build Status](https://travis-ci.org/puppetlabs/puppet.png?branch=master)](https://travis-ci.org/puppetlabs/puppet)
+
 Puppet, an automated administrative engine for your Linux and Unix systems, performs
 administrative tasks (such as adding users, installing packages, and updating server
 configurations) based on a centralized specification.
diff --git a/bin/extlookup2hiera b/bin/extlookup2hiera
old mode 100644
new mode 100755