moved postgres gem to production-only set, and specified patched version of Rails to fix CVS-2013-0156
new Gemfile with updated dependencies from update to rails 3.0.19
resolved merge conflict