Merge upstream sabermod

Also, you can get rid of "-b master" because git pulls the default branch if none is specified.