Merge branch 'master' into v1.3.0

Conflicts: CHANGELOG.md
AaronLasseigne · Aug 15, 2014 · 8e4a599 · 8e4a599
2 parents 76ae54b + 4872430
commit 8e4a599
Show file tree

Hide file tree

Showing 17 changed files with 359 additions and 88 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,4 @@ tmp
 *.swp
 .vagrant/
 Makefile
+vendor/
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,7 @@ before_install: gem update bundler
 gemfile:
 - Gemfile
 - gemfiles/activemodel3.rb
+install: bundle install --jobs=1 # rubygems/rubygems#982
 language: ruby
 notifications:
   email: false