Merge pull request #3 from etohehir/feat/capistrano

Feat/capistrano
Changed user names
Made small changes to capistrano, can't deploy yet