Add puma configuration for deploy
Merge branch 'master' into deploy_with_puma
Use capistrano/rails and capistrano/bundler when deploying

Also, fix roles and server config which crashed the capistrano/bundler
tasks.
Add capistrano tasks for handling puma and config files
Compress assets locally during deployment

Since it is REALLY slow on Amazon, compress them locally and rsync to
the server.
Use default capistrano tasks to symlink config files
Set correct puma configuration
Change puma unix socket configuration to use directory in /var/run
Another attempt to fix puma config for deployment
And again, another attempt to fix the puma deployment task
Fix incorrect log path for puma server
Merge branch 'master' into deploy_with_puma
Add sprockets to Gemfile to solve asset problems
Merge branch 'master' into deploy_with_puma
Also use asset pipeline for images and css files
Update Rails API to master so it includes strong parameters
Merge branch 'master' into deploy_with_puma
Use https for github to prevent ssh key issues on deploy
Also add updated Gemfile.lock which was missing from last commit
Add puma configuration for development environment