fix bug #1088
Merge branch 'development', remote-tracking branch 'origin' into 001_vodka
Merge pull request #7 from 6fusion/001_vodka

001 vodka
Uncommented the code to include log file is diagnostic zip
fix development deployment
changed deployment location from gin-crm to crm-vmware-gin
Merge branch 'development' into 1116_diagnostics
Renamed back to gin-crm
updated gin-crm.rb
Fix up environment deployment files.
Add whiskey/vodka deployment stages
Updated environment stage and configuration files
Updated to pull from repo instead of local files.
Fix gin stage file
Added logging to diagnostics
Removed /var/log/cron and /var/log/messages from diagnostics
added TMPDIR
removed TMPDIR
override ENV['TMP']
override ENV['TMP']