Changed unicorn.rb
Some changes
changed
Added some deploy changes. Will clean this up later
Restored unicorn files
merged conflicts
Removed unnecessary files