changes to deployment files
Merge branch 'master' of https://github.com/cparks0225/pds_perf

Conflicts:
	Gemfile
	Gemfile.lock
	config/database.yml
	config/deploy.rb