Deploy.rb refactoring
Further updates to Capfile and bash scripts