Edited deploy.rb for puma tasks
Merge branch 'dev' of https://github.com/codeflash/codeflash into dev
Merge remote-tracking branch 'origin/dev' into dev
Switched capistrano stuff.