Update Manifest.txt
Update gemspec
Merge branch 'master' of github.com:puma/puma