adjust thin config to capistrano deployment
Merge remote-tracking branch 'origin/master'