add nginx+unicorn support
modify unicorn+nginx conf
repair conflict