Update unicorn conf

Conflicts:
	config/unicorn.conf.rb