Changed deployment process to manually specify remote branch

...as well as avoid relying on upstream settings, because it causes
problems with master somehow having multiple upstream branches, and it
makes more sense for production to track origin/production than
libquest/production anyway.
Merge branch 'master' into production