1 worker for unicorn, and unicorn restart after publishing
Merge remote-tracking branch 'origin/master'