Edited deploy.rb for puma tasks
updated the user comments slightly
Merge pull request #125 from codeflash/dev

Dev
Merge branch 'dev' of https://github.com/codeflash/codeflash into dev
Update lib/tasks/doc.rake

Production tries to use 'yard', but doesn't have the gem in that namespace.
Update lib/tasks/doc.rake

Undo previous commit.
Install gem yard, on all ENVS, as a rake task requires it.
Update config/puma.rb
Merge branch 'master' into dev
Allows running.
Merge remote-tracking branch 'origin/dev' into dev
Merge remote-tracking branch 'origin/dev' into dev
Switched capistrano stuff.
Merge branch 'dev' into feature/ui