Merge branch 'hotfix/1.0.12'
Fix app server configuration bug

With all the upgrades for Capistrano, I didn't update the unicorn config file to write the Unix socket to the correct directory, so the web server couldn't connect.
Merge branch 'hotfix/1.0.13' into develop