* added unicorn
* added some models
staging.rb
merged upstream