Merge pull request #1501 from caleywoods/master

Update timeout comment in unicorn example config.

config/unicorn.rb.example

@@ -6,7 +6,7 @@ working_directory app_dir
 # worker spawn times
 preload_app true
-# nuke workers after 60 seconds (the default)
+# nuke workers after 30 seconds (60 is the default)
 timeout 30
 # listen on a Unix domain socket and/or a TCP port,