Latest capistrano, dotenv
Merge branch 'master' into bootstrap