Replaced Unicorn with Puma Web Server
Merge pull request #554 from sampritipanda/puma

Thx Sampriti!
Merge pull request #556 from AgileVentures/develop

Pushing develop to staging
Merge branch 'develop' of https://github.com/AgileVentures/WebsiteOne into develop