Merges default to upstream branch

Can just say git merge, and that'll merge with the branch's upstream by
default.
Merge branch 'master' into knewton