config db settings
deployment configs
deployment fixes
Merge branch 'capistrano_from_scratch'