Add whiskey/vodka deployment stages
Updated environment stage and configuration files
Updated to pull from repo instead of local files.
Fix gin stage file
Deployment updates
Deployment cleanup
update gems
Merge branch 'development' of github.com:6fusion/adaptor-vmware into development

Conflicts:
	Gemfile
	Gemfile.lock
Running specs.
Include context in deploy.
More deployment cleanup.
fix torquebox version at 2.2.0
merged development