Slow unicorn to 2 workers
Merge branch 'master' of https://github.com/emaxi/rails-web-experiment

Conflicts:
	config/unicorn.rb