bumped unicorn timeout to 90 seconds and made it configurable
Merge branch 'develop' into feature/autofollow_any_user