bf146c2 Merge pull request #43 from klrmn/master
cbc4fe0 fix getters

git-subtree-dir: automation-tests/browserid
git-subtree-split: bf146c230b5ea96590c25f8d55c16c57c8240744

create local prod branch if it doesn't exist and land the user on that.  also only try to delete local train- branch if it *does* exist.

change merge_train.sh to refer to prod with a fully qualified path in case it's yet to have been locally checked out