Deploy file for non current/shared server deployments
Allow branch to deploy to be specified on command line - fall back to current branch if not set.
Remove ‘/shared’ part of path from files
WIP making poolparty work
Fix version number and we no longer need to define paths.
Update deploy file to use rvm and work with new server directory structure.
Fix path to -web
No need to symlink anymore
Renamed directories on the servers
Remove some old cruft and make final updates for new server directories.
Merge branch 'server_update'

Conflicts:
	config/deploy.rb
Merge branch 'master' into production