Attempt to fix the failing travis builds.
Merge branch 'master' of github.com:asok/projectile-rails
Merge branch 'master' of github.com:asok/projectile-rails