Adding capistrano s3 deploy
Adding s3.yml to gitignore
Merge branch 'hotfix/deploy'
Adding deploy configuration