updated capistrano deploy and additional changes