Working with Capistrano
Merge branches 'capistrano' and 'deploy' into deploy