Merge branch '4.x'

* 4.x:
  (maint) Add Ruby 2.0.0 to Travis build matrix

Conflicts:
	.gitignore
	.travis.yml
	Gemfile

.gitignore

@@ -2,6 +2,6 @@ pkg/
 .DS_Store
 metadata.json
 coverage/
-vendor/
-.bundle/
 Gemfile.lock
+.bundle/
+vendor/bundle/

.travis.yml

@@ -1,20 +1,19 @@
 language: ruby
 bundler_args: --without development
-script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
+script: "bundle exec rake spec SPEC_OPTS='--color --format documentation'"
 rvm:
-  - 1.9.3
   - 1.8.7
+  - 1.9.3
+  - 2.0.0
   - ruby-head
 env:
-  - PUPPET_GEM_VERSION="~> 2.7"
   - PUPPET_GEM_VERSION=">= 3.0.0"
 matrix:
   allow_failures:
+    - rvm: 2.0.0
     - rvm: ruby-head
-  exclude:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7"
-    - rvm: ruby-head
+  include:
+    - rvm: 1.8.7
       env: PUPPET_GEM_VERSION="~> 2.7"
 notifications:
   email: false

Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source "https://rubygems.org"
 
 group :development do
   gem 'watchr'