Changed unicorn.rb
Some changes
changed
Added some deploy changes. Will clean this up later
Restored unicorn files
Modified unicorn.rb
Fixed staging nginx.conf
Fixed nginx.conf again\!
fix
Merge branch 'master' into staging
Merge branch 'master' into staging
Merge branch 'master' into staging
Removed unicorn
set environment to staging
pagination and scoring for staging
Merge branch 'master' into staging
Merge branch 'master' into staging
Merge branch 'master' into staging
Restarting after deploy staging
Merge branch 'master' into staging