uni conf
Merge branch 'master' of https://github.com/yanaizmene/booker

Conflicts:
	config/unicorn.rb