Ruby version fix (will fix that later)
Merge branch 'master' of github.com:seuros/capistrano-puma

Conflicts:
	capistrano-puma.gemspec
	capistrano3-puma.gemspec