changed the deploy config back to master

config/deploy_config.yml

@@ -6,7 +6,7 @@ cross_server:
   deploy_to: '/usr/local/app/diaspora'
   user: 'root'
   repo: 'git://github.com/diaspora/diaspora.git'
-  branch: 'salmon_refactor'
+  branch: 'master'
   default_env: 'development'
 servers:
   tom: