fix pid filenames to match what opscode unicorn cookbook generates
  - merge the two unicorn conf files
Merge branch 'unicorn' into integration/resque_and_email_alerts