Change unicorn timeout to 15s (value recommended by heroku)
Merge branch 'master' into heroku