update to Rails 4 final and change Puma config
Merge branch 'master' into master1