configure to use unicorn
Merge remote branch 'origin/master'