diff --git a/.gitignore b/.gitignore
index 3e5e9e69..133e989c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,16 @@
-Gemfile.lock
+.vagrant
+*.swp
+*.swo
+
+.bundle
+vendor/
+
 pkg/
+
+Gemfile.lock
+
+.rbenv*
+.rvmrc*
+.ruby-version
+
+spec/fixtures/
diff --git a/.travis.yml b/.travis.yml
index 4c8d1866..a7f594b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,24 @@
-language: ruby
 rvm:
   - 1.8.7
   - 1.9.3
+  - 2.0.0
 env:
-  - PUPPET_VERSION="2.6"
-  - PUPPET_VERSION="2.7"
-  - PUPPET_VERSION="3"
-
-script: 'rake spec'
-
-branches:
-  only:
-    - master
-    - develop
+  - PUPPET_VERSION=2.6.0
+  - PUPPET_VERSION=2.7.0
+  - PUPPET_VERSION=3.0.0
+  - PUPPET_VERSION=3.1.0
+  - PUPPET_VERSION=3.2.0
+matrix:
+  exclude:
+    # No support for Ruby 1.9 before Puppet 2.7
+    - rvm: 1.9.3
+      env: PUPPET_VERSION=2.6.0
+    # No support VERSIONfor Ruby 2.0 before Puppet 3.2
+    - rvm: 2.0.0
+      env: PUPPET_VERSION=2.6.0
+    - rvm: 2.0.0
+      env: PUPPET_VERSION=2.7.0
+    - rvm: 2.0.0
+      env: PUPPET_VERSION=3.0.0
+    - rvm: 2.0.0
+      env: PUPPET_VERSION=3.1.0
diff --git a/Gemfile b/Gemfile
index 763577ab..94d5dd9e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
-source :rubygems
+source "https://rubygems.org"
 
 gem 'rake'
 gem 'rspec'