Make master the master branch

@ben-sussman-zocdoc 

It annoys me that master is not the actual master of this project.  Lets make zocdoc_production master:

```

git checkout zocdoc-production
git checkout -b MakeMasterTheMasterBranch
git merge --strategy=ours --no-commit origin/master
git commit -m 'Killing master and replacing it with this branch'