Merge pull request #125 from codeflash/dev

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.
Update config/puma.rb
Merge branch 'master' into dev