Update branch for merge

Author: Nick Litwin

.travis.yml

@@ -23,8 +23,7 @@ deploy:
     skip_cleanup: true
     local_dir: dist
     on:
-      all_branches: true
-      repo: appirio-tech/topcoder-app
+      branch: dev
   - provider: s3
     cache_control: private, no-store, no-cache, must-revalidate, max-age=0
     detect_encoding: true
@@ -34,7 +33,7 @@ deploy:
     skip_cleanup: true
     local_dir: dist
     on:
-      branch: qa
+      branch: qa-integration
   - provider: s3
     cache_control: private, no-store, no-cache, must-revalidate, max-age=0
     access_key_id: $MASTER_AWS_KEY