I am pulling from upstream:

```
git remote -v
origin	https://github.com/wdwvt1/qiime.git (fetch)
origin	https://github.com/wdwvt1/qiime.git (push)
upstream	https://github.com/qiime/qiime.git (fetch)
upstream	https://github.com/qiime/qiime.git (push)
```
```
git checkout master
git pull upstream  master
git checkout ocs_collab
git merge master ocs_collab
```