Updated readme, fixed typo bug in unicorn.rb
syncd with master

Conflicts:
	config/unicorn.rb