deploy config
Merge branch 'master' of https://github.com/chadcodes/capytest

Conflicts:
	Capfile
	config/deploy.rb
	config/deploy/production.rb
Merge branch 'master' of https://github.com/chadcodes/capytest

Conflicts:
	config/deploy.rb
	config/deploy/production.rb
Merge branch 'master' of https://github.com/chadcodes/capytest