Merge pull request #275 from akofink/master

Update to the Capistrano script
Merge remote-tracking branch 'upstream/master'