Merge branch 'development' into stage
Merge branch 'development' into stage
Merge branch 'development' into stage
merge stage into master
update production deploy script
remove vi swp file
update capistrano production file
Merge branch 'development' into stage
Merge branch 'development' into stage
Merge branch 'stage'
Merge branch 'development' into stage
Merge branch 'stage'
Merge branch 'development' into stage
Merge branch 'stage'
set config file the same as stage temporarely
set correct rails env in unicorn config file
Adding UCLA email to app_config.yml
update unicorn config file
update unicorn script workers
update unicorn script workers for stage