add pg and capistrano for production
resolve merge conflicts