Merge pull request #1 from enijishor/working

working branch test
Merge pull request #2 from enijishor/working

capistrano
nobot test
deploy configs
te