updated db gems
added pg gem
removed incorrect junk
whoops
whoops
trying something new
Merge branch 'master' of heroku.com:beardsly

Conflicts:
	config/initializers/rspec.rb